xemacs-beta: configure comparison

comparison configure @ 263:727739f917cb r20-5b30

Import from CVS: tag r20-5b30

author	cvs
date	Mon, 13 Aug 2007 10:24:41 +0200
parents	405dd6d1825b
children	8efd647ea9ca

comparison

equal deleted inserted replaced

-:9d8607af9e13
+:727739f917cb
 const_is_losing='yes'
 puresize=''
 cflags='UNSPECIFIED'
 dynamic=''
 with_x11=''
+with_msw=''
 with_gung='no'
 with_minimal_tagbits='no'
 rel_alloc='default'
 with_system_malloc='default'
 with_dlmalloc='default'
 case "$opt" in
 	run_in_place	| \
 	with_x		| \
 	with_x11	| \
+	with_msw	| \
 	with_gcc	| \
 	with_gnu_make	| \
 	dynamic		| \
 	with_gung	| \
 	with_ncurses	| \
 ;;
 esac
 if test -z "$configuration"; then
 echo $ac_n "checking "host system type"""... $ac_c" 1>&6
-echo "configure:645: checking "host system type"" >&5
+echo "configure:647: checking "host system type"" >&5
 if configuration=`${CONFIG_SHELL-/bin/sh} $srcdir/config.guess | \
 sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'` ; then
 echo "$ac_t""$configuration" 1>&6
 else
 echo "$ac_t""unknown" 1>&6
 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:659: checking whether ln -s works" >&5
+echo "configure:661: checking whether ln -s works" >&5
 rm -f conftestdata
 if ln -s X conftestdata 2>/dev/null
 then
 rm -f conftestdata
 }
 echo "checking "the configuration name"" 1>&6
-echo "configure:836: checking "the configuration name"" >&5
+echo "configure:838: checking "the configuration name"" >&5
 internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'`
 if canonical=`$srcdir/config.sub "$internal_configuration"` ; then : ; else
 exit $?
 fi
 xe_save_CFLAGS="$CFLAGS"
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1294: checking for $ac_word" >&5
+echo "configure:1296: 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="${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:1320: checking for $ac_word" >&5
+echo "configure:1322: 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="${IFS}:"
 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:1365: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1367: 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_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&5'
 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 1377 "configure"
+#line 1379 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 ac_cv_prog_cc_works=yes
 # If we can't run a trivial program, we are probably using a cross compiler.
 if (./conftest; exit) 2>/dev/null; then
 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:1401: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1403: 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:1406: checking whether we are using GNU C" >&5
+echo "configure:1408: 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:1413: \"$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:1415: \"$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
 GCC=yes
 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:1427: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1429: 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:1456: checking for $ac_word" >&5
+echo "configure:1458: 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="${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:1482: checking for $ac_word" >&5
+echo "configure:1484: 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="${IFS}:"
 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:1527: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1529: 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_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&5'
 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 1539 "configure"
+#line 1541 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 ac_cv_prog_cc_works=yes
 # If we can't run a trivial program, we are probably using a cross compiler.
 if (./conftest; exit) 2>/dev/null; then
 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:1563: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1565: 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:1568: checking whether we are using GNU C" >&5
+echo "configure:1570: 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:1575: \"$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:1577: \"$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
 GCC=yes
 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:1589: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1591: 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:1618: checking for $ac_word" >&5
+echo "configure:1620: 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="${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:1644: checking for $ac_word" >&5
+echo "configure:1646: 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="${IFS}:"
 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:1689: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1691: 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_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&5'
 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 1701 "configure"
+#line 1703 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 ac_cv_prog_cc_works=yes
 # If we can't run a trivial program, we are probably using a cross compiler.
 if (./conftest; exit) 2>/dev/null; then
 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:1725: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1727: 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:1730: checking whether we are using GNU C" >&5
+echo "configure:1732: 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:1737: \"$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:1739: \"$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
 GCC=yes
 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:1751: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1753: 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:1784: checking how to run the C preprocessor" >&5
+echo "configure:1786: 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 1797 "configure"
+#line 1799 "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:1803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 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 1814 "configure"
+#line 1816 "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:1820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 :
 else
 echo "$ac_err" >&5
 fi
 echo "$ac_t""$CPP" 1>&6
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1843: checking for AIX" >&5
+echo "configure:1845: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1845 "configure"
+#line 1847 "configure"
 #include "confdefs.h"
 #ifdef _AIX
 yes
 #endif
 rm -f conftest*
 echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:1872: checking for GNU libc" >&5
+echo "configure:1874: checking for GNU libc" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1874 "configure"
+#line 1876 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
 #if ! (defined __GLIBC__ || defined __GNU_LIBRARY__)
 ******* ======= ******** &&&&&&&&
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:1886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1888: \"$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
 EOF
 }
 echo $ac_n "checking whether we are using SunPro C""... $ac_c" 1>&6
-echo "configure:1907: checking whether we are using SunPro C" >&5
+echo "configure:1909: checking whether we are using SunPro C" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1909 "configure"
+#line 1911 "configure"
 #include "confdefs.h"
 int main() {
 #ifndef __SUNPRO_C
 #error Not a  SunPro compiler :-(
 ******* ======= ******** &&&&&&&&
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:1920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 __sunpro_c=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 test -n "$unexec"          && extra_objs="$extra_objs $unexec" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"$unexec\""
 fi
 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:2196: checking for dynodump" >&5
+echo "configure:2198: 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
 esac
 fi
 if test "$add_runtime_path" = "yes"; then
 echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:2294: checking "for runtime libraries flag"" >&5
+echo "configure:2296: checking "for runtime libraries flag"" >&5
 dash_r=""
 for try_dash_r in "-R" "-R " "-rpath "; do
 xe_check_libs="${try_dash_r}/no/such/file-or-directory"
 cat > conftest.$ac_ext <<EOF
-#line 2299 "configure"
+#line 2301 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:2306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 dash_r="$try_dash_r"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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:2393: checking for malloc_get_state" >&5
+echo "configure:2395: checking for malloc_get_state" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2396 "configure"
+#line 2398 "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.  */
 malloc_get_state();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:2419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_malloc_get_state=yes"
 else
 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 for malloc_set_state""... $ac_c" 1>&6
-echo "configure:2439: checking for malloc_set_state" >&5
+echo "configure:2441: checking for malloc_set_state" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2442 "configure"
+#line 2444 "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:2465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_malloc_set_state=yes"
 else
 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:2485: checking whether __after_morecore_hook exists" >&5
+echo "configure:2487: checking whether __after_morecore_hook exists" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2487 "configure"
+#line 2489 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int main() {
 __after_morecore_hook = 0
 ; return 0; }
 EOF
-if { (eval echo configure:2494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 echo "$ac_t""yes" 1>&6
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 # 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:2559: checking for $ac_word" >&5
+echo "configure:2561: 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="${IFS}:"
 # AIX /bin/install
 # 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:2612: checking for a BSD compatible install" >&5
+echo "configure:2614: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 IFS="${IFS= 	}"; ac_save_IFS="$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:2663: checking for $ac_word" >&5
+echo "configure:2665: 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="${IFS}:"
 for ac_hdr in mach/mach.h sys/stropts.h sys/timeb.h sys/time.h unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2694: checking for $ac_hdr" >&5
+echo "configure:2696: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2697 "configure"
+#line 2699 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2704: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 for ac_hdr in utime.h locale.h libgen.h fcntl.h ulimit.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_hdr" >&5
+echo "configure:2737: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2738 "configure"
+#line 2740 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 for ac_hdr in linux/version.h 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:2776: checking for $ac_hdr" >&5
+echo "configure:2778: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2779 "configure"
+#line 2781 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 echo "$ac_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:2814: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2816: checking for sys/wait.h that is POSIX.1 compatible" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2817 "configure"
+#line 2819 "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:2833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2835: \"$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:2857: checking for ANSI C header files" >&5
+echo "configure:2859: checking for ANSI C header files" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2860 "configure"
+#line 2862 "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:2868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 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 2885 "configure"
+#line 2887 "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 2903 "configure"
+#line 2905 "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 2921 "configure"
+#line 2923 "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:2932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:2934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 :
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 fi
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2957: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2959: checking whether time.h and sys/time.h may both be included" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2960 "configure"
+#line 2962 "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:2969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2971: \"$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:2993: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:2995: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2996 "configure"
+#line 2998 "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:3008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3010: \"$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:3033: checking for struct utimbuf" >&5
+echo "configure:3035: checking for struct utimbuf" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3035 "configure"
+#line 3037 "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:3054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3056: \"$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:3074: checking return type of signal handlers" >&5
+echo "configure:3076: checking return type of signal handlers" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3077 "configure"
+#line 3079 "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:3094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3096: \"$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:3116: checking for size_t" >&5
+echo "configure:3118: checking for size_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3119 "configure"
+#line 3121 "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:3150: checking for pid_t" >&5
+echo "configure:3152: checking for pid_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3153 "configure"
+#line 3155 "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:3184: checking for uid_t in sys/types.h" >&5
+echo "configure:3186: checking for uid_t in sys/types.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3187 "configure"
+#line 3189 "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:3223: checking for mode_t" >&5
+echo "configure:3225: checking for mode_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3226 "configure"
+#line 3228 "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:3257: checking for off_t" >&5
+echo "configure:3259: checking for off_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3260 "configure"
+#line 3262 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
 fi
 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:3292: checking for struct timeval" >&5
+echo "configure:3294: checking for struct timeval" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3294 "configure"
+#line 3296 "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:3310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3312: \"$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:3332: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:3334: checking whether struct tm is in sys/time.h or time.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3335 "configure"
+#line 3337 "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:3343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3345: \"$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:3367: checking for tm_zone in struct tm" >&5
+echo "configure:3369: checking for tm_zone in struct tm" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3370 "configure"
+#line 3372 "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:3378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3380: \"$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:3401: checking for tzname" >&5
+echo "configure:3403: checking for tzname" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3404 "configure"
+#line 3406 "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:3414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:3440: checking for working const" >&5
+echo "configure:3442: checking for working const" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3443 "configure"
+#line 3445 "configure"
 #include "confdefs.h"
 int main() {
 /* Ultrix mips cc rejects this.  */
 const int foo = 10;
 }
 ; return 0; }
 EOF
-if { (eval echo configure:3492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3494: \"$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:3517: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:3519: 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:3542: checking whether byte ordering is bigendian" >&5
+echo "configure:3544: 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 3547 "configure"
+#line 3549 "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:3558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3560: \"$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 3562 "configure"
+#line 3564 "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:3573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3575: \"$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 3590 "configure"
+#line 3592 "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:3603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ac_cv_c_bigendian=no
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:3629: checking size of short" >&5
+echo "configure:3631: checking size of short" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3632 "configure"
+#line 3634 "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:3643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ac_cv_sizeof_short=`cat conftestval`
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&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:3670: checking size of int" >&5
+echo "configure:3672: checking size of int" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3673 "configure"
+#line 3675 "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:3684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ac_cv_sizeof_int=`cat conftestval`
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:3705: checking size of long" >&5
+echo "configure:3707: checking size of long" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3708 "configure"
+#line 3710 "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:3719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ac_cv_sizeof_long=`cat conftestval`
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:3740: checking size of long long" >&5
+echo "configure:3742: checking size of long long" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3743 "configure"
+#line 3745 "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:3754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3756: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:3775: checking size of void *" >&5
+echo "configure:3777: checking size of void *" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3778 "configure"
+#line 3780 "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:3789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3791: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:3811: checking for long file names" >&5
+echo "configure:3813: 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 in -lm""... $ac_c" 1>&6
-echo "configure:3858: checking for sin in -lm" >&5
+echo "configure:3860: 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 3863 "configure"
+#line 3865 "configure"
 #include "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:3874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 cat > conftest.$ac_ext <<EOF
-#line 3916 "configure"
+#line 3918 "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:3923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_INVERSE_HYPERBOLIC
 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:3940: checking type of mail spool file locking" >&5
+echo "configure:3942: checking type of mail spool file locking" >&5
 test -z "$mail_locking" -a "$mail_use_flock" = "yes" && mail_locking=flock
 test -z "$mail_locking" -a "$mail_use_lockf" = "yes" && mail_locking=lockf
 if   test "$mail_locking" = "lockf"; then { test "$extra_verbose" = "yes" && cat << \EOF
 Defining REAL_MAIL_USE_LOCKF
 EOF
 else mail_locking="dot-locking"
 fi
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:3964: checking for kstat_open in -lkstat" >&5
+echo "configure:3966: 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 3969 "configure"
+#line 3971 "configure"
 #include "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:3980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:4014: checking for kvm_read in -lkvm" >&5
+echo "configure:4016: 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 4019 "configure"
+#line 4021 "configure"
 #include "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:4030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:4064: checking for cma_open in -lpthreads" >&5
+echo "configure:4066: 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 4069 "configure"
+#line 4071 "configure"
 #include "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:4080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test "$ac_cv_lib_pthreads_cma_open" = "yes"; then
 case "$opsys" in decosf*) c_switch_site="$c_switch_site -threads";; esac
 fi
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:4116: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:4118: 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
 echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:4127: checking for \"-z ignore\" linker flag" >&5
+echo "configure:4129: checking for \"-z ignore\" linker flag" >&5
 case "`ld -h 2>&1`" in
 *-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6
 ld_switch_site="-z ignore $ld_switch_site" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-z ignore\" to \$ld_switch_site"; fi ;;
 *) echo "$ac_t""no" 1>&6 ;;
 esac
 fi
 echo "checking "for specified window system"" 1>&6
-echo "configure:4137: checking "for specified window system"" >&5
+echo "configure:4139: 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:4167: checking for X" >&5
+echo "configure:4169: 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 4227 "configure"
+#line 4229 "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:4232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 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 4301 "configure"
+#line 4303 "configure"
 #include "confdefs.h"
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:4308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
 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:4417: checking whether -R must be followed by a space" >&5
+echo "configure:4419: 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 4420 "configure"
+#line 4422 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:4427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 4443 "configure"
+#line 4445 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:4450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:4486: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:4488: 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 4491 "configure"
+#line 4493 "configure"
 #include "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:4502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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:4526: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:4528: 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 4531 "configure"
+#line 4533 "configure"
 #include "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:4542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 # 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:4571: checking for gethostbyname" >&5
+echo "configure:4573: checking for gethostbyname" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4574 "configure"
+#line 4576 "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:4597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:4618: checking for gethostbyname in -lnsl" >&5
+echo "configure:4620: 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 4623 "configure"
+#line 4625 "configure"
 #include "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:4634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 # 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:4664: checking for connect" >&5
+echo "configure:4666: checking for connect" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4667 "configure"
+#line 4669 "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:4690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:4713: checking "$xe_msg_checking"" >&5
+echo "configure:4715: 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 4718 "configure"
+#line 4720 "configure"
 #include "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:4729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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:4753: checking for remove" >&5
+echo "configure:4755: checking for remove" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4756 "configure"
+#line 4758 "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:4779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:4800: checking for remove in -lposix" >&5
+echo "configure:4802: 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 4805 "configure"
+#line 4807 "configure"
 #include "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:4816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
 echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:4840: checking for shmat" >&5
+echo "configure:4842: checking for shmat" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4843 "configure"
+#line 4845 "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:4866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:4887: checking for shmat in -lipc" >&5
+echo "configure:4889: 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 4892 "configure"
+#line 4894 "configure"
 #include "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:4903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 # These have to be linked with before -lX11, unlike the other
 # libraries we check for below, so use a different variable.
 #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
 echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:4937: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4939: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lICE "
 cat > conftest.$ac_ext <<EOF
-#line 4942 "configure"
+#line 4944 "configure"
 #include "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:4953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 case "$with_x11" in
 yes ) window_system=x11  HAVE_X_WINDOWS=yes ;;
 no  ) window_system=none HAVE_X_WINDOWS=no  ;;
 esac
-if test "$window_system" = "none" && test -z "$with_tty"; then
+if test "$with_msw" != "no"; then
 echo "checking for MS-Windows" 1>&6
-echo "configure:4990: checking for MS-Windows" >&5
+echo "configure:4992: checking for MS-Windows" >&5
 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:4993: checking for main in -lgdi32" >&5
+echo "configure:4995: 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 4998 "configure"
+#line 5000 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 rm -f conftest*
 xe_check_libs=""
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 echo "$ac_t""yes" 1>&6
-have_msw=yes
+with_msw=yes
 else
 echo "$ac_t""no" 1>&6
 fi
-if test "$have_msw" = "yes"; then
+if test "$with_msw" = "yes"; then
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_MS_WINDOWS
 EOF
 cat >> confdefs.h <<\EOF
 #define HAVE_MS_WINDOWS 1
 EOF
 }
 libs_system="$libs_system -lshell32 -lgdi32 -luser32" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-lshell32 -lgdi32 -luser32\" to \$libs_system"; fi
-window_system=msw
+if test "$window_system" != x11; then
-test "$with_scrollbars"   != "no" && with_scrollbars=msw && extra_objs="$extra_objs scrollbar-msw.o" &&  if test "$extra_verbose" = "yes"; then
+	window_system=msw
+	test "$with_scrollbars" != "no" && with_scrollbars=msw \
+	    && extra_objs="$extra_objs scrollbar-msw.o" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"scrollbar-msw.o\""
 fi
-test "$with_menubars"   != "no" && with_menubars=msw && extra_objs="$extra_objs menubar-msw.o" &&  if test "$extra_verbose" = "yes"; then
+	test "$with_menubars"   != "no" && with_menubars=msw \
+	    && extra_objs="$extra_objs menubar-msw.o" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"menubar-msw.o\""
 fi
-with_dialogs=msw
+	with_dialogs=msw
-with_toolbars=no
+	with_toolbars=no
-with_tty=no
+else
+	test "$with_scrollbars"   != "no" && extra_objs="$extra_objs scrollbar-msw.o" &&  if test "$extra_verbose" = "yes"; then
+echo "    xemacs will be linked with \"scrollbar-msw.o\""
+fi
+	test "$with_menubars"   != "no" && extra_objs="$extra_objs menubar-msw.o" &&  if test "$extra_verbose" = "yes"; then
+echo "    xemacs will be linked with \"menubar-msw.o\""
+fi
+fi
 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 gif_err.o gifalloc.o dgif_lib.o" &&  if test "$extra_verbose" = "yes"; then
+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" &&  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 gif_err.o gifalloc.o dgif_lib.o\""
+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\""
 fi
 fi
 fi
 if test "$with_x11" = "yes"; then
 for var in x_libraries x_includes X_CFLAGS X_LIBS X_PRE_LIBS X_EXTRA_LIBS; do eval "echo \"$var = '\$$var'\""; done
 echo
 fi
 echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:5151: checking for X defines extracted by xmkmf" >&5
+echo "configure:5163: checking for X defines extracted by xmkmf" >&5
 rm -fr conftestdir
 if mkdir conftestdir; then
 cd conftestdir
 cat > Imakefile <<'EOF'
 xetest:
 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:5183: checking for X11/Intrinsic.h" >&5
+echo "configure:5195: checking for X11/Intrinsic.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5186 "configure"
+#line 5198 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:5215: checking for XOpenDisplay in -lX11" >&5
+echo "configure:5227: 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 5220 "configure"
+#line 5232 "configure"
 #include "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:5231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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:5256: checking "$xe_msg_checking"" >&5
+echo "configure:5268: 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 5261 "configure"
+#line 5273 "configure"
 #include "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:5272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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:5299: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:5311: 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 5304 "configure"
+#line 5316 "configure"
 #include "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:5315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:5338: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:5350: 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 5343 "configure"
+#line 5355 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char XtOpenDisplay();
 int main() {
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:5354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:5377: checking the version of X11 being used" >&5
+echo "configure:5389: checking the version of X11 being used" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5379 "configure"
+#line 5391 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 main(int c, char* v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:5384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:5396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ./conftest foobar; x11_release=$?
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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:5408: checking for $ac_hdr" >&5
+echo "configure:5420: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5411 "configure"
+#line 5423 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 done
 echo $ac_n "checking for XFree86""... $ac_c" 1>&6
-echo "configure:5447: checking for XFree86" >&5
+echo "configure:5459: 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:5467: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:5479: 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 5472 "configure"
+#line 5484 "configure"
 #include "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:5483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:5522: checking for main in -lXbsd" >&5
+echo "configure:5534: 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 5527 "configure"
+#line 5539 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 test "$opsys" = "hpux9"     && opsysfile="s/hpux9-x11r4.h"
 test "$opsys" = "hpux9-shr" && opsysfile="s/hpux9shxr4.h"
 esac
 echo "checking for session-management option" 1>&6
-echo "configure:5593: checking for session-management option" >&5;
+echo "configure:5605: checking for session-management option" >&5;
 if test "$with_session" != "no"; then
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_SESSION
 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:5608: checking for X11/Xauth.h" >&5
+echo "configure:5620: checking for X11/Xauth.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5611 "configure"
+#line 5623 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 with_xauth=no
 fi
 }
 test -z "$with_xauth" && {
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:5639: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:5651: 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 5644 "configure"
+#line 5656 "configure"
 #include "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:5655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 test "$with_cde" = "yes" && with_tooltalk=yes # CDE requires tooltalk
 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:5719: checking for ${dir}tt_c.h" >&5
+echo "configure:5731: checking for ${dir}tt_c.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5722 "configure"
+#line 5734 "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:5727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5739: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 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:5756: checking "$xe_msg_checking"" >&5
+echo "configure:5768: 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 5761 "configure"
+#line 5773 "configure"
 #include "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:5772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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:5821: checking for Dt/Dt.h" >&5
+echo "configure:5833: checking for Dt/Dt.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5824 "configure"
+#line 5836 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 with_cde=no
 fi
 }
 test -z "$with_cde" && {
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:5852: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:5864: 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 5857 "configure"
+#line 5869 "configure"
 #include "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:5868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 with_tooltalk=yes # CDE requires Tooltalk
 need_motif=yes    # CDE requires Motif
 fi
 echo "checking for LDAP" 1>&6
-echo "configure:5905: checking for LDAP" >&5
+echo "configure:5917: 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:5908: checking for ldap.h" >&5
+echo "configure:5920: checking for ldap.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5911 "configure"
+#line 5923 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 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:5939: checking for lber.h" >&5
+echo "configure:5951: checking for lber.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5942 "configure"
+#line 5954 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 }
 test -z "$with_ldap" -o "$with_ldap" = "yes" && {
 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:5972: checking "$xe_msg_checking"" >&5
+echo "configure:5984: 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 5977 "configure"
+#line 5989 "configure"
 #include "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:5988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 }
 test \( -z "$with_ldap" -o "$with_ldap" = "yes" \) -a  "$with_umich_ldap" = "no" && {
 echo $ac_n "checking for ldap_set_option in -lldap10""... $ac_c" 1>&6
-echo "configure:6011: checking for ldap_set_option in -lldap10" >&5
+echo "configure:6023: checking for ldap_set_option in -lldap10" >&5
 ac_lib_var=`echo ldap10'_'ldap_set_option | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lldap10 "
 cat > conftest.$ac_ext <<EOF
-#line 6016 "configure"
+#line 6028 "configure"
 #include "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_set_option();
 int main() {
 ldap_set_option()
 ; return 0; }
 EOF
-if { (eval echo configure:6027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test "$with_x11" = "yes"; then
 echo "checking for X11 graphics libraries" 1>&6
-echo "configure:6111: checking for X11 graphics libraries" >&5
+echo "configure:6123: checking for X11 graphics libraries" >&5
 echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:6114: checking for Xpm - no older than 3.4f" >&5
+echo "configure:6126: checking for Xpm - no older than 3.4f" >&5
 xe_check_libs=-lXpm
 test -z "$with_xpm" && { cat > conftest.$ac_ext <<EOF
-#line 6117 "configure"
+#line 6129 "configure"
 #include "confdefs.h"
 #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:6127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:6139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ./conftest foobar; xpm_status=$?;
 if test "$xpm_status" = "0"; then with_xpm=yes; else with_xpm=no; fi;
 else
 echo "configure: failed program was:" >&5
 libs_x="-lXpm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXpm\" to \$libs_x"; 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:6165: checking for compface.h" >&5
+echo "configure:6177: checking for compface.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6168 "configure"
+#line 6180 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 with_xface=no
 fi
 }
 test -z "$with_xface" && {
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:6196: checking for UnGenFace in -lcompface" >&5
+echo "configure:6208: 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 6201 "configure"
+#line 6213 "configure"
 #include "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:6212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 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:6263: checking for jpeglib.h" >&5
+echo "configure:6275: checking for jpeglib.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6266 "configure"
+#line 6278 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 with_jpeg=no
 fi
 }
 test -z "$with_jpeg" && {
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:6294: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:6306: 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 6299 "configure"
+#line 6311 "configure"
 #include "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:6310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 libs_x="-ljpeg $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-ljpeg\" to \$libs_x"; fi
 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:6346: checking for png.h" >&5
+echo "configure:6358: checking for png.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6349 "configure"
+#line 6361 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 echo "$ac_t""no" 1>&6
 with_png=no
 fi
 }
 test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:6376: checking for pow" >&5
+echo "configure:6388: checking for pow" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6379 "configure"
+#line 6391 "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:6402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_pow=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 for extra_libs in "" "-lz" "-lgz"; do
 xe_msg_checking="for png_read_image in -lpng"
 test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6427: checking "$xe_msg_checking"" >&5
+echo "configure:6439: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lpng $extra_libs"
 cat > conftest.$ac_ext <<EOF
-#line 6432 "configure"
+#line 6444 "configure"
 #include "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:6443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 for extra_libs in "" "-lz" "-lgz"; do
 xe_msg_checking="for TIFFReadScanline in -ltiff"
 test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6485: checking "$xe_msg_checking"" >&5
+echo "configure:6497: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
 xe_check_libs=" -ltiff $extra_libs"
 cat > conftest.$ac_ext <<EOF
-#line 6490 "configure"
+#line 6502 "configure"
 #include "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 TIFFReadScanline();
 int main() {
 TIFFReadScanline()
 ; return 0; }
 EOF
-if { (eval echo configure:6501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 libs_x="$tiff_libs $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"$tiff_libs\" to \$libs_x"; fi
 fi
 echo $ac_n "checking for XawScrollbarSetThumb in -lXaw""... $ac_c" 1>&6
-echo "configure:6539: checking for XawScrollbarSetThumb in -lXaw" >&5
+echo "configure:6551: checking for XawScrollbarSetThumb in -lXaw" >&5
 ac_lib_var=`echo Xaw'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lXaw "
 cat > conftest.$ac_ext <<EOF
-#line 6544 "configure"
+#line 6556 "configure"
 #include "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:6555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:6579: checking for Xm/Xm.h" >&5
+echo "configure:6591: checking for Xm/Xm.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6582 "configure"
+#line 6594 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 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:6604: checking for XmStringFree in -lXm" >&5
+echo "configure:6616: 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 6609 "configure"
+#line 6621 "configure"
 #include "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:6620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 fi
 if test "$with_mule" = "yes" ; then
 echo "checking for Mule-related features" 1>&6
-echo "configure:6911: checking for Mule-related features" >&5
+echo "configure:6923: 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:6936: checking for $ac_hdr" >&5
+echo "configure:6948: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6939 "configure"
+#line 6951 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 done
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:6975: checking for strerror in -lintl" >&5
+echo "configure:6987: 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 6980 "configure"
+#line 6992 "configure"
 #include "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:6991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 echo "checking for Mule input methods" 1>&6
-echo "configure:7024: checking for Mule input methods" >&5
+echo "configure:7036: checking for Mule input methods" >&5
 test -z "$with_xim" -a "$opsys" != "sol2" && with_xim=no
 case "$with_xim" in "" | "yes" )
 echo "checking for XIM" 1>&6
-echo "configure:7028: checking for XIM" >&5
+echo "configure:7040: checking for XIM" >&5
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:7031: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:7043: 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 7036 "configure"
+#line 7048 "configure"
 #include "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:7047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 fi
 if test "$with_xfs" = "yes" ; then
 echo "checking for XFontSet" 1>&6
-echo "configure:7112: checking for XFontSet" >&5
+echo "configure:7124: checking for XFontSet" >&5
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:7115: checking for XmbDrawString in -lX11" >&5
+echo "configure:7127: 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 7120 "configure"
+#line 7132 "configure"
 #include "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:7131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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:7171: checking for wnn/jllib.h" >&5
+echo "configure:7183: checking for wnn/jllib.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7174 "configure"
+#line 7186 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 }
 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:7204: checking for $ac_func" >&5
+echo "configure:7216: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7207 "configure"
+#line 7219 "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:7230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:7259: checking for crypt in -lcrypt" >&5
+echo "configure:7271: 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 7264 "configure"
+#line 7276 "configure"
 #include "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:7275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 fi
 test -z "$with_wnn" && {
 echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-echo "configure:7309: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:7321: 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 7314 "configure"
+#line 7326 "configure"
 #include "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:7325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 extra_objs="$extra_objs mule-wnnfns.o" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"mule-wnnfns.o\""
 fi
 echo $ac_n "checking for jl_fi_dic_list in -lwnn""... $ac_c" 1>&6
-echo "configure:7362: checking for jl_fi_dic_list in -lwnn" >&5
+echo "configure:7374: checking for jl_fi_dic_list in -lwnn" >&5
 ac_lib_var=`echo wnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lwnn "
 cat > conftest.$ac_ext <<EOF
-#line 7367 "configure"
+#line 7379 "configure"
 #include "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:7378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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:7410: checking for canna/RK.h" >&5
+echo "configure:7422: checking for canna/RK.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7413 "configure"
+#line 7425 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 with_canna=no
 fi
 }
 test -z "$with_canna" && {
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:7441: checking for RkBgnBun in -lRKC" >&5
+echo "configure:7453: 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 7446 "configure"
+#line 7458 "configure"
 #include "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:7457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 }
 test -z "$with_canna" && {
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:7480: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:7492: 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 7485 "configure"
+#line 7497 "configure"
 #include "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:7496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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:7545: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:7557: 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 7550 "configure"
+#line 7562 "configure"
 #include "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:7561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask strcasecmp strerror tzset ulimit usleep utimes waitpid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7634: checking for $ac_func" >&5
+echo "configure:7646: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7637 "configure"
+#line 7649 "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:7660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_$ac_func=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi ;;
 * )
 for ac_func in realpath
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7697: checking for $ac_func" >&5
+echo "configure:7709: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7700 "configure"
+#line 7712 "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:7723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_$ac_func=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "    xemacs will be linked with \"realpath.o\""
 fi ;;
 esac
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:7756: checking whether netdb declares h_errno" >&5
+echo "configure:7768: checking whether netdb declares h_errno" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7758 "configure"
+#line 7770 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:7765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 echo "$ac_t""yes" 1>&6
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_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:7785: checking for sigsetjmp" >&5
+echo "configure:7797: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7787 "configure"
+#line 7799 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:7794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7806: \"$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:7814: checking whether localtime caches TZ" >&5
+echo "configure:7826: checking whether localtime caches TZ" >&5
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 7818 "configure"
+#line 7830 "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:7853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 emacs_cv_localtime_cache=no
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday cannot accept two arguments""... $ac_c" 1>&6
-echo "configure:7882: checking whether gettimeofday cannot accept two arguments" >&5
+echo "configure:7894: checking whether gettimeofday cannot accept two arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7884 "configure"
+#line 7896 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
 struct timezone dummy;
 gettimeofday (&time, &dummy);
 ; return 0; }
 EOF
-if { (eval echo configure:7906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 echo "$ac_t""no" 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:7928: checking for inline" >&5
+echo "configure:7940: checking for inline" >&5
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
 cat > conftest.$ac_ext <<EOF
-#line 7933 "configure"
+#line 7945 "configure"
 #include "confdefs.h"
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:7940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_c_inline=$ac_kw; break
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 # 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:7990: checking for working alloca.h" >&5
+echo "configure:8002: checking for working alloca.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7993 "configure"
+#line 8005 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:8000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:8024: checking for alloca" >&5
+echo "configure:8036: checking for alloca" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8027 "configure"
+#line 8039 "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:8050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:8089: checking whether alloca needs Cray hooks" >&5
+echo "configure:8101: checking whether alloca needs Cray hooks" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8092 "configure"
+#line 8104 "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:8116: checking for $ac_func" >&5
+echo "configure:8128: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8119 "configure"
+#line 8131 "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:8142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:8172: checking stack direction for C alloca" >&5
+echo "configure:8184: checking stack direction for C alloca" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8175 "configure"
+#line 8187 "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:8194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ac_cv_c_stack_direction=1
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&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:8222: checking for vfork.h" >&5
+echo "configure:8234: checking for vfork.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8225 "configure"
+#line 8237 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 else
 echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:8258: checking for working vfork" >&5
+echo "configure:8270: checking for working vfork" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8261 "configure"
+#line 8273 "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:8356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ac_cv_func_vfork_works=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:8381: checking for working strcoll" >&5
+echo "configure:8393: checking for working strcoll" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8384 "configure"
+#line 8396 "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:8394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ac_cv_func_strcoll_works=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8421: checking for $ac_func" >&5
+echo "configure:8433: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8424 "configure"
+#line 8436 "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:8447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:8475: checking whether getpgrp takes no argument" >&5
+echo "configure:8487: checking whether getpgrp takes no argument" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8478 "configure"
+#line 8490 "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:8533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 ac_cv_func_getpgrp_void=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:8559: checking for working mmap" >&5
+echo "configure:8571: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 8562 "configure"
+#line 8574 "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:8595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
 have_mmap=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:8629: checking for termios.h" >&5
+echo "configure:8641: checking for termios.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8632 "configure"
+#line 8644 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 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:8680: checking for termio.h" >&5
+echo "configure:8692: checking for termio.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8683 "configure"
+#line 8695 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:8720: checking for socket" >&5
+echo "configure:8732: checking for socket" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8723 "configure"
+#line 8735 "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:8746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:8761: checking for netinet/in.h" >&5
+echo "configure:8773: checking for netinet/in.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8764 "configure"
+#line 8776 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 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:8786: checking for arpa/inet.h" >&5
+echo "configure:8798: checking for arpa/inet.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8789 "configure"
+#line 8801 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8794: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 #define HAVE_SOCKETS 1
 EOF
 }
 echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:8819: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:8831: checking "for sun_len member in struct sockaddr_un"" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8821 "configure"
+#line 8833 "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:8832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_SOCKADDR_SUN_LEN
 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:8850: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:8862: checking "for ip_mreq struct in netinet/in.h"" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8852 "configure"
+#line 8864 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 int main() {
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:8861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_MULTICAST
 EOF
 cat >> confdefs.h <<\EOF
 echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:8892: checking for msgget" >&5
+echo "configure:8904: checking for msgget" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8895 "configure"
+#line 8907 "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:8918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:8933: checking for sys/ipc.h" >&5
+echo "configure:8945: checking for sys/ipc.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8936 "configure"
+#line 8948 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 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:8958: checking for sys/msg.h" >&5
+echo "configure:8970: checking for sys/msg.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8961 "configure"
+#line 8973 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:9004: checking for dirent.h" >&5
+echo "configure:9016: checking for dirent.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9007 "configure"
+#line 9019 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 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:9039: checking for sys/dir.h" >&5
+echo "configure:9051: checking for sys/dir.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9042 "configure"
+#line 9054 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:9080: checking for nlist.h" >&5
+echo "configure:9092: checking for nlist.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9083 "configure"
+#line 9095 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 echo "checking "for sound support"" 1>&6
-echo "configure:9118: checking "for sound support"" >&5
+echo "configure:9130: checking "for sound support"" >&5
 case "$with_sound" in
 native | both ) with_native_sound=yes;;
 nas    | no   ) with_native_sound=no;;
 esac
 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:9129: checking for multimedia/audio_device.h" >&5
+echo "configure:9141: checking for multimedia/audio_device.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9132 "configure"
+#line 9144 "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:9137: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 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:9185: checking for ALopenport in -laudio" >&5
+echo "configure:9197: 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 9190 "configure"
+#line 9202 "configure"
 #include "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:9201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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:9232: checking for AOpenAudio in -lAlib" >&5
+echo "configure:9244: 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 9237 "configure"
+#line 9249 "configure"
 #include "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:9248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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:9286: checking for ${dir}/soundcard.h" >&5
+echo "configure:9298: checking for ${dir}/soundcard.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9289 "configure"
+#line 9301 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 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 9364 "configure"
+#line 9376 "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
 test -z "$with_tty" && with_tty=yes
 if test "$with_tty" = "yes"  ; then
 echo "checking for TTY-related features" 1>&6
-echo "configure:9391: checking for TTY-related features" >&5
+echo "configure:9403: 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:9407: checking for tgetent in -lncurses" >&5
+echo "configure:9419: 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 9412 "configure"
+#line 9424 "configure"
 #include "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:9423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:9456: checking for ncurses/curses.h" >&5
+echo "configure:9468: checking for ncurses/curses.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9459 "configure"
+#line 9471 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 echo "$ac_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:9486: checking for ncurses/term.h" >&5
+echo "configure:9498: checking for ncurses/term.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9489 "configure"
+#line 9501 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 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:9524: checking for ncurses/curses.h" >&5
+echo "configure:9536: checking for ncurses/curses.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9527 "configure"
+#line 9539 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 	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:9567: checking for tgetent in -l$lib" >&5
+echo "configure:9579: 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 9572 "configure"
+#line 9584 "configure"
 #include "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:9583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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:9614: checking for tgetent in -lcurses" >&5
+echo "configure:9626: 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 9619 "configure"
+#line 9631 "configure"
 #include "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:9630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 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:9648: checking for tgetent in -ltermcap" >&5
+echo "configure:9660: 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 9653 "configure"
+#line 9665 "configure"
 #include "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:9664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 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:9712: checking for gpm.h" >&5
+echo "configure:9724: checking for gpm.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9715 "configure"
+#line 9727 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 with_gpm=no
 fi
 }
 test -z "$with_gpm" && {
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:9743: checking for Gpm_Open in -lgpm" >&5
+echo "configure:9755: 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 9748 "configure"
+#line 9760 "configure"
 #include "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:9759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "    xemacs will be linked with \"event-unixoid.o\""
 fi
 echo "checking for database support" 1>&6
-echo "configure:9808: checking for database support" >&5
+echo "configure:9820: checking for database support" >&5
 if test "$with_database_gnudbm" != "no"; then
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:9813: checking for dbm_open in -lgdbm" >&5
+echo "configure:9825: 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 9818 "configure"
+#line 9830 "configure"
 #include "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:9829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test "$with_database_gnudbm" != "yes"; then
 echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:9851: checking for dbm_open" >&5
+echo "configure:9863: checking for dbm_open" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9854 "configure"
+#line 9866 "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:9877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_dbm_open=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 fi
 if test "$with_database_dbm" != "no"; then
 echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:9913: checking for dbm_open" >&5
+echo "configure:9925: checking for dbm_open" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9916 "configure"
+#line 9928 "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:9939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_dbm_open=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test "$need_libdbm" != "no"; then
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:9960: checking for dbm_open in -ldbm" >&5
+echo "configure:9972: 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 9965 "configure"
+#line 9977 "configure"
 #include "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:9976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 fi
 if test "$with_database_berkdb" != "no"; then
 echo $ac_n "checking for dbopen""... $ac_c" 1>&6
-echo "configure:10013: checking for dbopen" >&5
+echo "configure:10025: checking for dbopen" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10016 "configure"
+#line 10028 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char dbopen(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 dbopen();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:10039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_func_dbopen=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test "$need_libdb" != "no"; then
 echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6
-echo "configure:10060: checking for dbopen in -ldb" >&5
+echo "configure:10072: checking for dbopen in -ldb" >&5
 ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'`
 xe_check_libs=" -ldb "
 cat > conftest.$ac_ext <<EOF
-#line 10065 "configure"
+#line 10077 "configure"
 #include "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 dbopen();
 int main() {
 dbopen()
 ; return 0; }
 EOF
-if { (eval echo configure:10076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test "$with_database_berkdb" = "yes"; then
 for path in "db/db.h" "db.h"; do
 cat > conftest.$ac_ext <<EOF
-#line 10100 "configure"
+#line 10112 "configure"
 #include "confdefs.h"
 #ifdef HAVE_INTTYPES_H
 #define __BIT_TYPES_DEFINED__
 #include <inttypes.h>
 typedef uint8_t  u_int8_t;
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:10118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 db_h_path="$path"; break
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test "$with_socks" = "yes"; then
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:10170: checking for SOCKSinit in -lsocks" >&5
+echo "configure:10182: 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 10175 "configure"
+#line 10187 "configure"
 #include "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:10186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 LIBS="-Bstatic -lut -Bdynamic $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-Bstatic -lut -Bdynamic\" to \$LIBS"; fi
 fi
 test -z "$with_shlib" && { ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:10241: checking for dlfcn.h" >&5
+echo "configure:10253: checking for dlfcn.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10244 "configure"
+#line 10256 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10261: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
 rm -rf conftest*
 eval "ac_cv_header_$ac_safe=yes"
 else
 with_shlib=no
 fi
 }
 test -z "$with_shlib" && {
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:10272: checking for dlopen in -ldl" >&5
+echo "configure:10284: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 xe_check_libs=" -ldl "
 cat > conftest.$ac_ext <<EOF
-#line 10277 "configure"
+#line 10289 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char dlopen();
 int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:10288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 rm -f conftest*
 xe_check_libs=""
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 echo "$ac_t""yes" 1>&6
-:
+LIBS="-ldl $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-ldl\" to \$LIBS"; fi
+else
+echo "$ac_t""no" 1>&6
+echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
+echo "configure:10318: 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 10323 "configure"
+#include "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:10334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=yes"
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+echo "$ac_t""yes" 1>&6
+with_shlib=yes
 else
 echo "$ac_t""no" 1>&6
 with_shlib=no
+fi
 fi
 }
 test -z "$with_shlib" && with_shlib=yes
 if test "$with_shlib" = "yes"; then
 }
 extra_objs="$extra_objs dlopen.o" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"dlopen.o\""
 fi
-LIBS="-ldl $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-ldl\" to \$LIBS"; fi
+ld_dynamic_link_flags=
-fi
+case "$opsys" in
+linux*) ld_dynamic_link_flags="-rdynamic" ;;
+*) ;;
+esac
+fi
+{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining HAVE_UNIX_PROCESSES
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_UNIX_PROCESSES 1
+EOF
+}
+extra_objs="$extra_objs process-unix.o" &&  if test "$extra_verbose" = "yes"; then
+echo "    xemacs will be linked with \"process-unix.o\""
+fi
 T=""
 for W in $CFLAGS; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
 for dir in $MAKE_SUBDIR; do echo "import $dir"; done
 ) > .sbinit
 fi
 rm -f core
 s%@archlibdir@%$archlibdir%g
 s%@archlibdir_user_defined@%$archlibdir_user_defined%g
 s%@docdir@%$docdir%g
 s%@bitmapdir@%$bitmapdir%g
 s%@extra_objs@%$extra_objs%g
+s%@ld_dynamic_link_flags@%$ld_dynamic_link_flags%g
 s%@machfile@%$machfile%g
 s%@opsysfile@%$opsysfile%g
 s%@c_switch_general@%$c_switch_general%g
 s%@c_switch_window_system@%$c_switch_window_system%g
 s%@c_switch_all@%$c_switch_all%g

Mercurial > hg > xemacs-beta

comparison configure @ 263:727739f917cb r20-5b30