changeset 47402:aaa302e0c7ae

Regenerated with autoconf (GNU Autoconf) 2.52 and GNU m4 1.4.
author Markus Rost <rost@math.uni-bielefeld.de>
date Wed, 11 Sep 2002 15:48:27 +0000
parents 13110a0745b5
children ac79feb260f8
files configure
diffstat 1 files changed, 1616 insertions(+), 1570 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Wed Sep 11 09:32:07 2002 +0000
+++ b/configure	Wed Sep 11 15:48:27 2002 +0000
@@ -681,7 +681,6 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-game-user        use specified user for game directory
   --without-gcc           don't use GCC to compile Emacs if GCC is found
   --without-pop           don't support POP mail retrieval with movemail
   --with-kerberos         support Kerberos-authenticated POP
@@ -892,7 +891,7 @@
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:895: loading site script $ac_site_file" >&5
+    { echo "$as_me:894: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
@@ -903,7 +902,7 @@
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:906: loading cache $cache_file" >&5
+    { echo "$as_me:905: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -911,7 +910,7 @@
     esac
   fi
 else
-  { echo "$as_me:914: creating cache $cache_file" >&5
+  { echo "$as_me:913: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -927,21 +926,21 @@
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:930: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:929: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:934: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:933: error: \`$ac_var' was not set in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:940: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:939: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:942:   former value:  $ac_old_val" >&5
+        { echo "$as_me:941:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:944:   current value: $ac_new_val" >&5
+        { echo "$as_me:943:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -960,9 +959,9 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:963: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:962: error: changes in the environment can compromise the build" >&5
 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:965: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:964: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -982,10 +981,10 @@
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:985: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:984: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:988: \$? = $ac_status" >&5
+  echo "$as_me:987: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_path_separator=';'
 else
@@ -1020,12 +1019,6 @@
 
 gameuser=games
 
-# Check whether --with-game-user or --without-game-user was given.
-if test "${with_game_user+set}" = set; then
-  withval="$with_game_user"
-  gameuser="$withval"
-fi;
-
 # Check whether --with-gcc or --without-gcc was given.
 if test "${with_gcc+set}" = set; then
   withval="$with_gcc"
@@ -1103,7 +1096,7 @@
 	    a | at | ath | athe | athen | athena )	val=athena ;;
 	    m | mo | mot | moti | motif )	val=motif ;;
 	    * )
-{ { echo "$as_me:1106: error: \`--with-x-toolkit=$withval' is invalid\;
+{ { echo "$as_me:1099: error: \`--with-x-toolkit=$withval' is invalid\;
 this option's value should be \`yes', \`no', \`lucid', \`athena', or \`motif'.
 Currently, \`yes', \`athena' and \`lucid' are synonyms." >&5
 echo "$as_me: error: \`--with-x-toolkit=$withval' is invalid\;
@@ -1191,7 +1184,7 @@
 #### Check if the source directory already has a configured system in it.
 if test `pwd` != `(cd ${srcdir} && pwd)` \
    && test -f "${srcdir}/src/config.h" ; then
-  { echo "$as_me:1194: WARNING: The directory tree \`${srcdir}' is being used
+  { echo "$as_me:1187: WARNING: The directory tree \`${srcdir}' is being used
    as a build directory right now; it has been configured in its own
    right.  To configure in another directory as well, you MUST
    use GNU make.  If you do not have GNU make, then you must
@@ -1236,7 +1229,7 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1239: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1232: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1246,11 +1239,11 @@
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1249: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1242: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1253: checking build system type" >&5
+echo "$as_me:1246: checking build system type" >&5
 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1259,23 +1252,23 @@
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1262: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1255: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:1266: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1259: error: $ac_config_sub $ac_cv_build_alias failed." >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1271: result: $ac_cv_build" >&5
+echo "$as_me:1264: result: $ac_cv_build" >&5
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-echo "$as_me:1278: checking host system type" >&5
+echo "$as_me:1271: checking host system type" >&5
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1284,12 +1277,12 @@
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:1287: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1280: error: $ac_config_sub $ac_cv_host_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1292: result: $ac_cv_host" >&5
+echo "$as_me:1285: result: $ac_cv_host" >&5
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1924,9 +1917,15 @@
   ;;
 
   ## PowerPC reference platform
+  powerpcle-*-solaris2.5* )
+    machine=prep
+    opsys=sol2-5
+  ;;
+
+  ## PowerPC reference platform
   powerpcle-*-solaris2* )
     machine=prep
-    opsys=sol2-5
+    opsys=sol2-6
   ;;
 
   ## Pyramid machines
@@ -2068,8 +2067,13 @@
 		NON_GNU_CPP=/usr/ccs/lib/cpp
 		RANLIB="ar -ts"
 		;;
+      *-sunos5.6* | *-solaris2.6* )
+		opsys=sol2-6
+		NON_GNU_CPP=/usr/ccs/lib/cpp
+		RANLIB="ar -ts"
+		;;
       *-sunos5* | *-solaris* )
-		opsys=sol2-5
+		opsys=sol2-6
 		NON_GNU_CPP=/usr/ccs/lib/cpp
 		;;
       *			  ) opsys=bsd4-2   ;;
@@ -2272,7 +2276,7 @@
 fi
 
 if test $unported = yes; then
-  { { echo "$as_me:2275: error: Emacs hasn't been ported to \`${canonical}' systems.
+  { { echo "$as_me:2279: error: Emacs hasn't been ported to \`${canonical}' systems.
 Check \`etc/MACHINES' for recognized configuration names." >&5
 echo "$as_me: error: Emacs hasn't been ported to \`${canonical}' systems.
 Check \`etc/MACHINES' for recognized configuration names." >&2;}
@@ -2301,7 +2305,7 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:2304: checking for $ac_word" >&5
+echo "$as_me:2308: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2316,7 +2320,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:2319: found $ac_dir/$ac_word" >&5
+echo "$as_me:2323: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2324,10 +2328,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:2327: result: $CC" >&5
+  echo "$as_me:2331: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:2330: result: no" >&5
+  echo "$as_me:2334: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2336,7 +2340,7 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:2339: checking for $ac_word" >&5
+echo "$as_me:2343: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2351,7 +2355,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:2354: found $ac_dir/$ac_word" >&5
+echo "$as_me:2358: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2359,10 +2363,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:2362: result: $ac_ct_CC" >&5
+  echo "$as_me:2366: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:2365: result: no" >&5
+  echo "$as_me:2369: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2375,7 +2379,7 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:2378: checking for $ac_word" >&5
+echo "$as_me:2382: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2390,7 +2394,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:2393: found $ac_dir/$ac_word" >&5
+echo "$as_me:2397: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2398,10 +2402,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:2401: result: $CC" >&5
+  echo "$as_me:2405: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:2404: result: no" >&5
+  echo "$as_me:2408: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2410,7 +2414,7 @@
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:2413: checking for $ac_word" >&5
+echo "$as_me:2417: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2425,7 +2429,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:2428: found $ac_dir/$ac_word" >&5
+echo "$as_me:2432: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2433,10 +2437,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:2436: result: $ac_ct_CC" >&5
+  echo "$as_me:2440: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:2439: result: no" >&5
+  echo "$as_me:2443: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2449,7 +2453,7 @@
 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 "$as_me:2452: checking for $ac_word" >&5
+echo "$as_me:2456: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2469,7 +2473,7 @@
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:2472: found $ac_dir/$ac_word" >&5
+echo "$as_me:2476: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2491,10 +2495,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:2494: result: $CC" >&5
+  echo "$as_me:2498: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:2497: result: no" >&5
+  echo "$as_me:2501: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2505,7 +2509,7 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:2508: checking for $ac_word" >&5
+echo "$as_me:2512: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2520,7 +2524,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:2523: found $ac_dir/$ac_word" >&5
+echo "$as_me:2527: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2528,10 +2532,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:2531: result: $CC" >&5
+  echo "$as_me:2535: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:2534: result: no" >&5
+  echo "$as_me:2538: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2544,7 +2548,7 @@
 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 "$as_me:2547: checking for $ac_word" >&5
+echo "$as_me:2551: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2559,7 +2563,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:2562: found $ac_dir/$ac_word" >&5
+echo "$as_me:2566: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2567,10 +2571,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:2570: result: $ac_ct_CC" >&5
+  echo "$as_me:2574: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:2573: result: no" >&5
+  echo "$as_me:2577: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2582,32 +2586,32 @@
 
 fi
 
-test -z "$CC" && { { echo "$as_me:2585: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:2589: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:2590:" \
+echo "$as_me:2594:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:2593: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2597: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2596: \$? = $ac_status" >&5
+  echo "$as_me:2600: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:2598: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2602: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2601: \$? = $ac_status" >&5
+  echo "$as_me:2605: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:2603: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2607: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2606: \$? = $ac_status" >&5
+  echo "$as_me:2610: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 2610 "configure"
+#line 2614 "configure"
 #include "confdefs.h"
 
 int
@@ -2623,13 +2627,13 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:2626: checking for C compiler default output" >&5
+echo "$as_me:2630: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:2629: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:2633: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:2632: \$? = $ac_status" >&5
+  echo "$as_me:2636: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -2652,34 +2656,34 @@
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:2655: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:2659: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:2661: result: $ac_file" >&5
+echo "$as_me:2665: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:2666: checking whether the C compiler works" >&5
+echo "$as_me:2670: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:2672: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:2675: \$? = $ac_status" >&5
+  { (eval echo "$as_me:2676: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2679: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:2682: error: cannot run C compiled programs.
+	{ { echo "$as_me:2686: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -2687,24 +2691,24 @@
     fi
   fi
 fi
-echo "$as_me:2690: result: yes" >&5
+echo "$as_me:2694: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:2697: checking whether we are cross compiling" >&5
+echo "$as_me:2701: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:2699: result: $cross_compiling" >&5
+echo "$as_me:2703: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:2702: checking for executable suffix" >&5
+echo "$as_me:2706: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:2704: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:2707: \$? = $ac_status" >&5
+if { (eval echo "$as_me:2708: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:2711: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2720,25 +2724,25 @@
   esac
 done
 else
-  { { echo "$as_me:2723: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:2727: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:2729: result: $ac_cv_exeext" >&5
+echo "$as_me:2733: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:2735: checking for object suffix" >&5
+echo "$as_me:2739: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2741 "configure"
+#line 2745 "configure"
 #include "confdefs.h"
 
 int
@@ -2750,10 +2754,10 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:2753: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2757: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2756: \$? = $ac_status" >&5
+  echo "$as_me:2760: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
@@ -2765,24 +2769,24 @@
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:2768: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:2772: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:2775: result: $ac_cv_objext" >&5
+echo "$as_me:2779: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:2779: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:2783: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2785 "configure"
+#line 2789 "configure"
 #include "confdefs.h"
 
 int
@@ -2797,16 +2801,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2800: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2804: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2803: \$? = $ac_status" >&5
+  echo "$as_me:2807: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2806: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:2809: \$? = $ac_status" >&5
+  { (eval echo "$as_me:2810: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2813: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -2818,19 +2822,19 @@
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:2821: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:2825: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:2827: checking whether $CC accepts -g" >&5
+echo "$as_me:2831: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2833 "configure"
+#line 2837 "configure"
 #include "confdefs.h"
 
 int
@@ -2842,16 +2846,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2845: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2849: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2848: \$? = $ac_status" >&5
+  echo "$as_me:2852: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2851: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:2854: \$? = $ac_status" >&5
+  { (eval echo "$as_me:2855: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2858: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -2861,7 +2865,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2864: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2868: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -2888,16 +2892,16 @@
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2891: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2895: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2894: \$? = $ac_status" >&5
+  echo "$as_me:2898: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2897: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:2900: \$? = $ac_status" >&5
+  { (eval echo "$as_me:2901: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2904: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -2909,7 +2913,7 @@
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 2912 "configure"
+#line 2916 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2922,16 +2926,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2925: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2929: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2928: \$? = $ac_status" >&5
+  echo "$as_me:2932: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2931: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:2934: \$? = $ac_status" >&5
+  { (eval echo "$as_me:2935: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2938: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -2941,7 +2945,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 2944 "configure"
+#line 2948 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2953,16 +2957,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2956: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2960: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2959: \$? = $ac_status" >&5
+  echo "$as_me:2963: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2962: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:2965: \$? = $ac_status" >&5
+  { (eval echo "$as_me:2966: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2969: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3021,28 +3025,18 @@
   CC="$CC $NON_GCC_TEST_OPTIONS"
 fi
 
-if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x
-then
-  ac_link="$ac_link $GCC_LINK_TEST_OPTIONS"
-fi
-
-if test x$GCC = x && test "x$NON_GCC_LINK_TEST_OPTIONS" != x
-then
-  ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS"
-fi
-
 #### Some other nice autoconf tests.  If you add a test here which
 #### should make an entry in src/config.h, don't forget to add an
 #### #undef clause to src/config.h.in for autoconf to modify.
 
-echo "$as_me:3038: checking whether ln -s works" >&5
+echo "$as_me:3032: checking whether ln -s works" >&5
 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:3042: result: yes" >&5
+  echo "$as_me:3036: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3045: result: no, using $LN_S" >&5
+  echo "$as_me:3039: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
@@ -3051,7 +3045,7 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:3054: checking how to run the C preprocessor" >&5
+echo "$as_me:3048: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -3072,18 +3066,18 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3075 "configure"
+#line 3069 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:3080: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3074: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3086: \$? = $ac_status" >&5
+  echo "$as_me:3080: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3106,17 +3100,17 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3109 "configure"
+#line 3103 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:3113: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3107: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3119: \$? = $ac_status" >&5
+  echo "$as_me:3113: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3153,7 +3147,7 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:3156: result: $CPP" >&5
+echo "$as_me:3150: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -3163,18 +3157,18 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3166 "configure"
+#line 3160 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:3171: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3165: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3177: \$? = $ac_status" >&5
+  echo "$as_me:3171: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3197,17 +3191,17 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3200 "configure"
+#line 3194 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:3204: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3198: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3210: \$? = $ac_status" >&5
+  echo "$as_me:3204: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3235,7 +3229,7 @@
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:3238: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:3232: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3258,7 +3252,7 @@
 # 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 "$as_me:3261: checking for a BSD compatible install" >&5
+echo "$as_me:3255: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -3307,7 +3301,7 @@
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3310: result: $INSTALL" >&5
+echo "$as_me:3304: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3322,7 +3316,7 @@
 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 "$as_me:3325: checking for $ac_word" >&5
+echo "$as_me:3319: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_YACC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3337,7 +3331,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_YACC="$ac_prog"
-echo "$as_me:3340: found $ac_dir/$ac_word" >&5
+echo "$as_me:3334: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3345,10 +3339,10 @@
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  echo "$as_me:3348: result: $YACC" >&5
+  echo "$as_me:3342: result: $YACC" >&5
 echo "${ECHO_T}$YACC" >&6
 else
-  echo "$as_me:3351: result: no" >&5
+  echo "$as_me:3345: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3360,7 +3354,7 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:3363: checking for $ac_word" >&5
+echo "$as_me:3357: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3375,7 +3369,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:3378: found $ac_dir/$ac_word" >&5
+echo "$as_me:3372: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3383,10 +3377,10 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3386: result: $RANLIB" >&5
+  echo "$as_me:3380: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3389: result: no" >&5
+  echo "$as_me:3383: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3395,7 +3389,7 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:3398: checking for $ac_word" >&5
+echo "$as_me:3392: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3410,7 +3404,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:3413: found $ac_dir/$ac_word" >&5
+echo "$as_me:3407: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3419,10 +3413,10 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3422: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:3416: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3425: result: no" >&5
+  echo "$as_me:3419: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3433,10 +3427,20 @@
 
 fi
 
-echo "$as_me:3436: checking for AIX" >&5
+if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x
+then
+  ac_link="$ac_link $GCC_LINK_TEST_OPTIONS"
+fi
+
+if test x$GCC = x && test "x$NON_GCC_LINK_TEST_OPTIONS" != x
+then
+  ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS"
+fi
+
+echo "$as_me:3440: checking for AIX" >&5
 echo $ECHO_N "checking for AIX... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 3439 "configure"
+#line 3443 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -3445,21 +3449,21 @@
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
-  echo "$as_me:3448: result: yes" >&5
+  echo "$as_me:3452: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 cat >>confdefs.h <<\EOF
 #define _ALL_SOURCE 1
 EOF
 
 else
-  echo "$as_me:3455: result: no" >&5
+  echo "$as_me:3459: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest*
 
 #### Extract some information from the operating system and machine files.
 
-{ echo "$as_me:3462: checking the machine- and system-dependent files to find out
+{ echo "$as_me:3466: checking the machine- and system-dependent files to find out
  - which libraries the lib-src programs will want, and
  - whether the GNU malloc routines are usable..." >&5
 echo "$as_me: checking the machine- and system-dependent files to find out
@@ -3609,7 +3613,7 @@
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:3612: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:3616: checking for special C compiler options needed for large files" >&5
 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3621,7 +3625,7 @@
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >conftest.$ac_ext <<_ACEOF
-#line 3624 "configure"
+#line 3628 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3641,16 +3645,16 @@
 }
 _ACEOF
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3644: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3648: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3647: \$? = $ac_status" >&5
+  echo "$as_me:3651: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3650: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:3653: \$? = $ac_status" >&5
+  { (eval echo "$as_me:3654: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3657: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3660,16 +3664,16 @@
 rm -f conftest.$ac_objext
      	 CC="$CC -n32"
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3663: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3667: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3666: \$? = $ac_status" >&5
+  echo "$as_me:3670: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3669: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:3672: \$? = $ac_status" >&5
+  { (eval echo "$as_me:3673: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3676: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -3683,13 +3687,13 @@
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:3686: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:3690: result: $ac_cv_sys_largefile_CC" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  echo "$as_me:3692: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:3696: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3697,7 +3701,7 @@
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 3700 "configure"
+#line 3704 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3717,16 +3721,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3720: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3724: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3723: \$? = $ac_status" >&5
+  echo "$as_me:3727: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3726: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:3729: \$? = $ac_status" >&5
+  { (eval echo "$as_me:3730: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3733: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3735,7 +3739,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 3738 "configure"
+#line 3742 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -3756,16 +3760,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3759: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3763: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3762: \$? = $ac_status" >&5
+  echo "$as_me:3766: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3765: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:3768: \$? = $ac_status" >&5
+  { (eval echo "$as_me:3769: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3772: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -3776,7 +3780,7 @@
   break
 done
 fi
-echo "$as_me:3779: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:3783: result: $ac_cv_sys_file_offset_bits" >&5
 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
 if test "$ac_cv_sys_file_offset_bits" != no; then
 
@@ -3786,7 +3790,7 @@
 
 fi
 rm -f conftest*
-  echo "$as_me:3789: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:3793: checking for _LARGE_FILES value needed for large files" >&5
 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_large_files+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3794,7 +3798,7 @@
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 3797 "configure"
+#line 3801 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3814,16 +3818,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3817: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3821: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3820: \$? = $ac_status" >&5
+  echo "$as_me:3824: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3823: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:3826: \$? = $ac_status" >&5
+  { (eval echo "$as_me:3827: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3830: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3832,7 +3836,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 3835 "configure"
+#line 3839 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -3853,16 +3857,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3856: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3860: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3859: \$? = $ac_status" >&5
+  echo "$as_me:3863: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3862: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:3865: \$? = $ac_status" >&5
+  { (eval echo "$as_me:3866: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3869: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -3873,7 +3877,7 @@
   break
 done
 fi
-echo "$as_me:3876: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:3880: result: $ac_cv_sys_large_files" >&5
 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
 if test "$ac_cv_sys_large_files" != no; then
 
@@ -3891,23 +3895,23 @@
 for ac_header in machine/soundcard.h sys/soundcard.h soundcard.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3894: checking for $ac_header" >&5
+echo "$as_me:3898: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3900 "configure"
+#line 3904 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3904: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3908: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3910: \$? = $ac_status" >&5
+  echo "$as_me:3914: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3926,7 +3930,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3929: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:3933: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3937,7 +3941,7 @@
 done
 
   # Emulation library used on NetBSD.
-  echo "$as_me:3940: checking for _oss_ioctl in -lossaudio" >&5
+  echo "$as_me:3944: checking for _oss_ioctl in -lossaudio" >&5
 echo $ECHO_N "checking for _oss_ioctl in -lossaudio... $ECHO_C" >&6
 if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3945,7 +3949,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lossaudio  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3948 "configure"
+#line 3952 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3964,16 +3968,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3967: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:3970: \$? = $ac_status" >&5
+if { (eval echo "$as_me:3971: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:3974: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3973: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:3976: \$? = $ac_status" >&5
+  { (eval echo "$as_me:3977: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3980: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ossaudio__oss_ioctl=yes
 else
@@ -3984,7 +3988,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3987: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
+echo "$as_me:3991: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
 echo "${ECHO_T}$ac_cv_lib_ossaudio__oss_ioctl" >&6
 if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then
   LIBSOUND=-lossaudio
@@ -3999,23 +4003,23 @@
   termcap.h stdio_ext.h fcntl.h term.h strings.h coff.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4002: checking for $ac_header" >&5
+echo "$as_me:4006: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4008 "configure"
+#line 4012 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4012: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4016: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4018: \$? = $ac_status" >&5
+  echo "$as_me:4022: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4034,7 +4038,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4037: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4041: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4044,13 +4048,13 @@
 fi
 done
 
-echo "$as_me:4047: checking for ANSI C header files" >&5
+echo "$as_me:4051: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4053 "configure"
+#line 4057 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4058,13 +4062,13 @@
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:4061: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4065: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4067: \$? = $ac_status" >&5
+  echo "$as_me:4071: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4086,7 +4090,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 4089 "configure"
+#line 4093 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -4104,7 +4108,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 4107 "configure"
+#line 4111 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -4125,7 +4129,7 @@
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4128 "configure"
+#line 4132 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -4151,15 +4155,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4154: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:4157: \$? = $ac_status" >&5
+if { (eval echo "$as_me:4158: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:4161: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4159: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:4162: \$? = $ac_status" >&5
+  { (eval echo "$as_me:4163: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4166: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -4172,7 +4176,7 @@
 fi
 fi
 fi
-echo "$as_me:4175: result: $ac_cv_header_stdc" >&5
+echo "$as_me:4179: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -4182,13 +4186,13 @@
 
 fi
 
-echo "$as_me:4185: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:4189: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4191 "configure"
+#line 4195 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -4204,16 +4208,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4207: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4211: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4210: \$? = $ac_status" >&5
+  echo "$as_me:4214: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4213: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:4216: \$? = $ac_status" >&5
+  { (eval echo "$as_me:4217: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4220: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -4223,7 +4227,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4226: result: $ac_cv_header_time" >&5
+echo "$as_me:4230: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -4233,13 +4237,13 @@
 
 fi
 
-echo "$as_me:4236: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "$as_me:4240: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 echo $ECHO_N "checking for sys_siglist declaration in signal.h or unistd.h... $ECHO_C" >&6
 if test "${ac_cv_decl_sys_siglist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4242 "configure"
+#line 4246 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4257,16 +4261,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4260: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4264: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4263: \$? = $ac_status" >&5
+  echo "$as_me:4267: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4266: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:4269: \$? = $ac_status" >&5
+  { (eval echo "$as_me:4270: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4273: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_decl_sys_siglist=yes
 else
@@ -4276,7 +4280,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4279: result: $ac_cv_decl_sys_siglist" >&5
+echo "$as_me:4283: result: $ac_cv_decl_sys_siglist" >&5
 echo "${ECHO_T}$ac_cv_decl_sys_siglist" >&6
 if test $ac_cv_decl_sys_siglist = yes; then
 
@@ -4286,13 +4290,13 @@
 
 fi
 
-echo "$as_me:4289: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "$as_me:4293: checking for sys/wait.h that is POSIX.1 compatible" >&5
 echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
 if test "${ac_cv_header_sys_wait_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4295 "configure"
+#line 4299 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -4314,16 +4318,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4317: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4321: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4320: \$? = $ac_status" >&5
+  echo "$as_me:4324: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4323: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:4326: \$? = $ac_status" >&5
+  { (eval echo "$as_me:4327: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4330: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_sys_wait_h=yes
 else
@@ -4333,7 +4337,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4336: result: $ac_cv_header_sys_wait_h" >&5
+echo "$as_me:4340: result: $ac_cv_header_sys_wait_h" >&5
 echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
 if test $ac_cv_header_sys_wait_h = yes; then
 
@@ -4343,13 +4347,13 @@
 
 fi
 
-echo "$as_me:4346: checking for struct utimbuf" >&5
+echo "$as_me:4350: checking for struct utimbuf" >&5
 echo $ECHO_N "checking for struct utimbuf... $ECHO_C" >&6
 if test "${emacs_cv_struct_utimbuf+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4352 "configure"
+#line 4356 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -4373,16 +4377,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4376: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4380: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4379: \$? = $ac_status" >&5
+  echo "$as_me:4383: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4382: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:4385: \$? = $ac_status" >&5
+  { (eval echo "$as_me:4386: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4389: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_struct_utimbuf=yes
 else
@@ -4392,7 +4396,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4395: result: $emacs_cv_struct_utimbuf" >&5
+echo "$as_me:4399: result: $emacs_cv_struct_utimbuf" >&5
 echo "${ECHO_T}$emacs_cv_struct_utimbuf" >&6
 if test $emacs_cv_struct_utimbuf = yes; then
 
@@ -4402,13 +4406,13 @@
 
 fi
 
-echo "$as_me:4405: checking return type of signal handlers" >&5
+echo "$as_me:4409: checking return type of signal handlers" >&5
 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
 if test "${ac_cv_type_signal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4411 "configure"
+#line 4415 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4430,16 +4434,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4433: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4437: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4436: \$? = $ac_status" >&5
+  echo "$as_me:4440: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4439: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:4442: \$? = $ac_status" >&5
+  { (eval echo "$as_me:4443: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4446: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else
@@ -4449,20 +4453,20 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4452: result: $ac_cv_type_signal" >&5
+echo "$as_me:4456: result: $ac_cv_type_signal" >&5
 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <<EOF
 #define RETSIGTYPE $ac_cv_type_signal
 EOF
 
-echo "$as_me:4459: checking for speed_t" >&5
+echo "$as_me:4463: checking for speed_t" >&5
 echo $ECHO_N "checking for speed_t... $ECHO_C" >&6
 if test "${emacs_cv_speed_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4465 "configure"
+#line 4469 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -4474,16 +4478,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4477: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4481: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4480: \$? = $ac_status" >&5
+  echo "$as_me:4484: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4483: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:4486: \$? = $ac_status" >&5
+  { (eval echo "$as_me:4487: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4490: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_speed_t=yes
 else
@@ -4493,7 +4497,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4496: result: $emacs_cv_speed_t" >&5
+echo "$as_me:4500: result: $emacs_cv_speed_t" >&5
 echo "${ECHO_T}$emacs_cv_speed_t" >&6
 if test $emacs_cv_speed_t = yes; then
 
@@ -4503,13 +4507,13 @@
 
 fi
 
-echo "$as_me:4506: checking for struct timeval" >&5
+echo "$as_me:4510: checking for struct timeval" >&5
 echo $ECHO_N "checking for struct timeval... $ECHO_C" >&6
 if test "${emacs_cv_struct_timeval+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4512 "configure"
+#line 4516 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -4530,16 +4534,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4533: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4537: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4536: \$? = $ac_status" >&5
+  echo "$as_me:4540: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4539: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:4542: \$? = $ac_status" >&5
+  { (eval echo "$as_me:4543: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4546: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_struct_timeval=yes
 else
@@ -4549,7 +4553,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4552: result: $emacs_cv_struct_timeval" >&5
+echo "$as_me:4556: result: $emacs_cv_struct_timeval" >&5
 echo "${ECHO_T}$emacs_cv_struct_timeval" >&6
 HAVE_TIMEVAL=$emacs_cv_struct_timeval
 if test $emacs_cv_struct_timeval = yes; then
@@ -4560,13 +4564,13 @@
 
 fi
 
-echo "$as_me:4563: checking for struct exception" >&5
+echo "$as_me:4567: checking for struct exception" >&5
 echo $ECHO_N "checking for struct exception... $ECHO_C" >&6
 if test "${emacs_cv_struct_exception+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4569 "configure"
+#line 4573 "configure"
 #include "confdefs.h"
 #include <math.h>
 int
@@ -4578,16 +4582,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4581: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4585: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4584: \$? = $ac_status" >&5
+  echo "$as_me:4588: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4587: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:4590: \$? = $ac_status" >&5
+  { (eval echo "$as_me:4591: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4594: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_struct_exception=yes
 else
@@ -4597,7 +4601,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4600: result: $emacs_cv_struct_exception" >&5
+echo "$as_me:4604: result: $emacs_cv_struct_exception" >&5
 echo "${ECHO_T}$emacs_cv_struct_exception" >&6
 HAVE_EXCEPTION=$emacs_cv_struct_exception
 if test $emacs_cv_struct_exception != yes; then
@@ -4608,13 +4612,13 @@
 
 fi
 
-echo "$as_me:4611: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "$as_me:4615: checking whether struct tm is in sys/time.h or time.h" >&5
 echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
 if test "${ac_cv_struct_tm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4617 "configure"
+#line 4621 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -4628,16 +4632,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4631: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4635: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4634: \$? = $ac_status" >&5
+  echo "$as_me:4638: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4637: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:4640: \$? = $ac_status" >&5
+  { (eval echo "$as_me:4641: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4644: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_tm=time.h
 else
@@ -4647,7 +4651,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4650: result: $ac_cv_struct_tm" >&5
+echo "$as_me:4654: result: $ac_cv_struct_tm" >&5
 echo "${ECHO_T}$ac_cv_struct_tm" >&6
 if test $ac_cv_struct_tm = sys/time.h; then
 
@@ -4657,13 +4661,13 @@
 
 fi
 
-echo "$as_me:4660: checking for struct tm.tm_zone" >&5
+echo "$as_me:4664: checking for struct tm.tm_zone" >&5
 echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6
 if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4666 "configure"
+#line 4670 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -4679,16 +4683,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4682: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4686: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4685: \$? = $ac_status" >&5
+  echo "$as_me:4689: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4688: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:4691: \$? = $ac_status" >&5
+  { (eval echo "$as_me:4692: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4695: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_tm_tm_zone=yes
 else
@@ -4698,7 +4702,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4701: result: $ac_cv_member_struct_tm_tm_zone" >&5
+echo "$as_me:4705: result: $ac_cv_member_struct_tm_tm_zone" >&5
 echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6
 if test $ac_cv_member_struct_tm_tm_zone = yes; then
 
@@ -4715,13 +4719,13 @@
 EOF
 
 else
-  echo "$as_me:4718: checking for tzname" >&5
+  echo "$as_me:4722: checking for tzname" >&5
 echo $ECHO_N "checking for tzname... $ECHO_C" >&6
 if test "${ac_cv_var_tzname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4724 "configure"
+#line 4728 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -4737,16 +4741,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4740: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:4743: \$? = $ac_status" >&5
+if { (eval echo "$as_me:4744: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:4747: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4746: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:4749: \$? = $ac_status" >&5
+  { (eval echo "$as_me:4750: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4753: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_var_tzname=yes
 else
@@ -4756,7 +4760,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4759: result: $ac_cv_var_tzname" >&5
+echo "$as_me:4763: result: $ac_cv_var_tzname" >&5
 echo "${ECHO_T}$ac_cv_var_tzname" >&6
   if test $ac_cv_var_tzname = yes; then
 
@@ -4767,13 +4771,13 @@
   fi
 fi
 
-echo "$as_me:4770: checking for struct tm.tm_gmtoff" >&5
+echo "$as_me:4774: checking for struct tm.tm_gmtoff" >&5
 echo $ECHO_N "checking for struct tm.tm_gmtoff... $ECHO_C" >&6
 if test "${ac_cv_member_struct_tm_tm_gmtoff+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4776 "configure"
+#line 4780 "configure"
 #include "confdefs.h"
 #include <time.h>
 
@@ -4788,16 +4792,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4791: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4795: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4794: \$? = $ac_status" >&5
+  echo "$as_me:4798: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4797: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:4800: \$? = $ac_status" >&5
+  { (eval echo "$as_me:4801: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4804: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_tm_tm_gmtoff=yes
 else
@@ -4807,7 +4811,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4810: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5
+echo "$as_me:4814: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5
 echo "${ECHO_T}$ac_cv_member_struct_tm_tm_gmtoff" >&6
 if test $ac_cv_member_struct_tm_tm_gmtoff = yes; then
 
@@ -4817,7 +4821,7 @@
 
 fi
 
-echo "$as_me:4820: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:4824: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4825,7 +4829,7 @@
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 4828 "configure"
+#line 4832 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -4874,16 +4878,16 @@
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4877: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4881: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4880: \$? = $ac_status" >&5
+  echo "$as_me:4884: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4883: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:4886: \$? = $ac_status" >&5
+  { (eval echo "$as_me:4887: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4890: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -4900,18 +4904,18 @@
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:4903: result: none needed" >&5
+    echo "$as_me:4907: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:4906: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:4910: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
-echo "$as_me:4911: checking for function prototypes" >&5
+echo "$as_me:4915: checking for function prototypes" >&5
 echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
 if test "$ac_cv_prog_cc_stdc" != no; then
-  echo "$as_me:4914: result: yes" >&5
+  echo "$as_me:4918: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -4919,17 +4923,17 @@
 EOF
 
 else
-  echo "$as_me:4922: result: no" >&5
+  echo "$as_me:4926: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:4926: checking for working volatile" >&5
+echo "$as_me:4930: checking for working volatile" >&5
 echo $ECHO_N "checking for working volatile... $ECHO_C" >&6
 if test "${ac_cv_c_volatile+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4932 "configure"
+#line 4936 "configure"
 #include "confdefs.h"
 
 int
@@ -4943,16 +4947,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4946: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4950: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4949: \$? = $ac_status" >&5
+  echo "$as_me:4953: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4952: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:4955: \$? = $ac_status" >&5
+  { (eval echo "$as_me:4956: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4959: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_volatile=yes
 else
@@ -4962,7 +4966,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4965: result: $ac_cv_c_volatile" >&5
+echo "$as_me:4969: result: $ac_cv_c_volatile" >&5
 echo "${ECHO_T}$ac_cv_c_volatile" >&6
 if test $ac_cv_c_volatile = no; then
 
@@ -4972,13 +4976,13 @@
 
 fi
 
-echo "$as_me:4975: checking for an ANSI C-conforming const" >&5
+echo "$as_me:4979: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4981 "configure"
+#line 4985 "configure"
 #include "confdefs.h"
 
 int
@@ -5036,16 +5040,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5039: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5043: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5042: \$? = $ac_status" >&5
+  echo "$as_me:5046: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5045: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:5048: \$? = $ac_status" >&5
+  { (eval echo "$as_me:5049: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5052: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -5055,7 +5059,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5058: result: $ac_cv_c_const" >&5
+echo "$as_me:5062: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -5065,13 +5069,13 @@
 
 fi
 
-echo "$as_me:5068: checking for void * support" >&5
+echo "$as_me:5072: checking for void * support" >&5
 echo $ECHO_N "checking for void * support... $ECHO_C" >&6
 if test "${emacs_cv_void_star+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5074 "configure"
+#line 5078 "configure"
 #include "confdefs.h"
 
 int
@@ -5083,16 +5087,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5086: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5090: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5089: \$? = $ac_status" >&5
+  echo "$as_me:5093: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5092: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:5095: \$? = $ac_status" >&5
+  { (eval echo "$as_me:5096: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5099: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_void_star=yes
 else
@@ -5102,7 +5106,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5105: result: $emacs_cv_void_star" >&5
+echo "$as_me:5109: result: $emacs_cv_void_star" >&5
 echo "${ECHO_T}$emacs_cv_void_star" >&6
 if test $emacs_cv_void_star = yes; then
   cat >>confdefs.h <<\EOF
@@ -5116,7 +5120,7 @@
 
 fi
 
-echo "$as_me:5119: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:5123: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -5136,16 +5140,16 @@
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:5139: result: yes" >&5
+  echo "$as_me:5143: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:5143: result: no" >&5
+  echo "$as_me:5147: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:5148: checking for long file names" >&5
+echo "$as_me:5152: checking for long file names" >&5
 echo $ECHO_N "checking for long file names... $ECHO_C" >&6
 if test "${ac_cv_sys_long_file_names+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5184,7 +5188,7 @@
   rm -rf $ac_xdir 2>/dev/null
 done
 fi
-echo "$as_me:5187: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:5191: result: $ac_cv_sys_long_file_names" >&5
 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
 if test $ac_cv_sys_long_file_names = yes; then
 
@@ -5196,7 +5200,7 @@
 
 #### Choose a window system.
 
-echo "$as_me:5199: checking for X" >&5
+echo "$as_me:5203: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -5293,17 +5297,17 @@
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
-#line 5296 "configure"
+#line 5300 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:5300: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5304: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5306: \$? = $ac_status" >&5
+  echo "$as_me:5310: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5336,7 +5340,7 @@
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 5339 "configure"
+#line 5343 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -5348,16 +5352,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5351: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:5354: \$? = $ac_status" >&5
+if { (eval echo "$as_me:5355: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5358: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5357: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:5360: \$? = $ac_status" >&5
+  { (eval echo "$as_me:5361: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5364: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -5395,7 +5399,7 @@
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:5398: result: $have_x" >&5
+  echo "$as_me:5402: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -5405,7 +5409,7 @@
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:5408: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:5412: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -5503,13 +5507,13 @@
 # Assume not, until told otherwise.
 GNU_MALLOC=yes
 doug_lea_malloc=yes
-echo "$as_me:5506: checking for malloc_get_state" >&5
+echo "$as_me:5510: checking for malloc_get_state" >&5
 echo $ECHO_N "checking for malloc_get_state... $ECHO_C" >&6
 if test "${ac_cv_func_malloc_get_state+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5512 "configure"
+#line 5516 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_get_state (); below.  */
@@ -5540,16 +5544,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5543: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:5546: \$? = $ac_status" >&5
+if { (eval echo "$as_me:5547: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5550: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5549: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:5552: \$? = $ac_status" >&5
+  { (eval echo "$as_me:5553: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5556: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_malloc_get_state=yes
 else
@@ -5559,7 +5563,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5562: result: $ac_cv_func_malloc_get_state" >&5
+echo "$as_me:5566: result: $ac_cv_func_malloc_get_state" >&5
 echo "${ECHO_T}$ac_cv_func_malloc_get_state" >&6
 if test $ac_cv_func_malloc_get_state = yes; then
   :
@@ -5567,13 +5571,13 @@
   doug_lea_malloc=no
 fi
 
-echo "$as_me:5570: checking for malloc_set_state" >&5
+echo "$as_me:5574: checking for malloc_set_state" >&5
 echo $ECHO_N "checking for malloc_set_state... $ECHO_C" >&6
 if test "${ac_cv_func_malloc_set_state+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5576 "configure"
+#line 5580 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_set_state (); below.  */
@@ -5604,16 +5608,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5607: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:5610: \$? = $ac_status" >&5
+if { (eval echo "$as_me:5611: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5613: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:5616: \$? = $ac_status" >&5
+  { (eval echo "$as_me:5617: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_malloc_set_state=yes
 else
@@ -5623,7 +5627,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5626: result: $ac_cv_func_malloc_set_state" >&5
+echo "$as_me:5630: result: $ac_cv_func_malloc_set_state" >&5
 echo "${ECHO_T}$ac_cv_func_malloc_set_state" >&6
 if test $ac_cv_func_malloc_set_state = yes; then
   :
@@ -5631,13 +5635,13 @@
   doug_lea_malloc=no
 fi
 
-echo "$as_me:5634: checking whether __after_morecore_hook exists" >&5
+echo "$as_me:5638: checking whether __after_morecore_hook exists" >&5
 echo $ECHO_N "checking whether __after_morecore_hook exists... $ECHO_C" >&6
 if test "${emacs_cv_var___after_morecore_hook+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5640 "configure"
+#line 5644 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int
@@ -5649,16 +5653,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5652: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:5655: \$? = $ac_status" >&5
+if { (eval echo "$as_me:5656: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5659: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5658: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:5661: \$? = $ac_status" >&5
+  { (eval echo "$as_me:5662: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5665: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_var___after_morecore_hook=yes
 else
@@ -5668,7 +5672,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5671: result: $emacs_cv_var___after_morecore_hook" >&5
+echo "$as_me:5675: result: $emacs_cv_var___after_morecore_hook" >&5
 echo "${ECHO_T}$emacs_cv_var___after_morecore_hook" >&6
 if test $emacs_cv_var___after_morecore_hook = no; then
   doug_lea_malloc=no
@@ -5700,28 +5704,28 @@
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5703: checking for $ac_header" >&5
+echo "$as_me:5707: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5709 "configure"
+#line 5713 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5715: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5719: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5718: \$? = $ac_status" >&5
+  echo "$as_me:5722: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5721: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:5724: \$? = $ac_status" >&5
+  { (eval echo "$as_me:5725: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5728: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -5731,7 +5735,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5734: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5738: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -5744,23 +5748,23 @@
 for ac_header in stdlib.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5747: checking for $ac_header" >&5
+echo "$as_me:5751: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5753 "configure"
+#line 5757 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5757: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5761: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5763: \$? = $ac_status" >&5
+  echo "$as_me:5767: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5779,7 +5783,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5782: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5786: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -5792,13 +5796,13 @@
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5795: checking for $ac_func" >&5
+echo "$as_me:5799: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5801 "configure"
+#line 5805 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5829,16 +5833,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5832: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:5835: \$? = $ac_status" >&5
+if { (eval echo "$as_me:5836: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5839: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5838: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:5841: \$? = $ac_status" >&5
+  { (eval echo "$as_me:5842: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5845: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5848,7 +5852,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5851: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5855: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -5858,7 +5862,7 @@
 fi
 done
 
-echo "$as_me:5861: checking for working mmap" >&5
+echo "$as_me:5865: checking for working mmap" >&5
 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5867,7 +5871,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5870 "configure"
+#line 5874 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -5994,15 +5998,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5997: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6000: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6001: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6004: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6002: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6005: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6006: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6009: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -6014,7 +6018,7 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:6017: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:6021: result: $ac_cv_func_mmap_fixed_mapped" >&5
 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
@@ -6031,7 +6035,7 @@
 
 LIBS="$libsrc_libs $LIBS"
 
-echo "$as_me:6034: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:6038: checking for dnet_ntoa in -ldnet" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6039,7 +6043,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6042 "configure"
+#line 6046 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6058,16 +6062,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6061: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6064: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6065: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6068: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6067: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6070: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6071: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6074: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -6078,7 +6082,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6081: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:6085: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   cat >>confdefs.h <<EOF
@@ -6089,7 +6093,7 @@
 
 fi
 
-echo "$as_me:6092: checking for main in -lXbsd" >&5
+echo "$as_me:6096: checking for main in -lXbsd" >&5
 echo $ECHO_N "checking for main in -lXbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_Xbsd_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6097,7 +6101,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6100 "configure"
+#line 6104 "configure"
 #include "confdefs.h"
 
 int
@@ -6109,16 +6113,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6112: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6115: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6116: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6119: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6118: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6121: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6122: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6125: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xbsd_main=yes
 else
@@ -6129,13 +6133,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6132: result: $ac_cv_lib_Xbsd_main" >&5
+echo "$as_me:6136: result: $ac_cv_lib_Xbsd_main" >&5
 echo "${ECHO_T}$ac_cv_lib_Xbsd_main" >&6
 if test $ac_cv_lib_Xbsd_main = yes; then
   LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd"
 fi
 
-echo "$as_me:6138: checking for cma_open in -lpthreads" >&5
+echo "$as_me:6142: checking for cma_open in -lpthreads" >&5
 echo $ECHO_N "checking for cma_open in -lpthreads... $ECHO_C" >&6
 if test "${ac_cv_lib_pthreads_cma_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6143,7 +6147,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthreads  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6146 "configure"
+#line 6150 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6162,16 +6166,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6165: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6168: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6169: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6172: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6171: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6174: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6175: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6178: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_pthreads_cma_open=yes
 else
@@ -6182,7 +6186,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6185: result: $ac_cv_lib_pthreads_cma_open" >&5
+echo "$as_me:6189: result: $ac_cv_lib_pthreads_cma_open" >&5
 echo "${ECHO_T}$ac_cv_lib_pthreads_cma_open" >&6
 if test $ac_cv_lib_pthreads_cma_open = yes; then
   cat >>confdefs.h <<EOF
@@ -6193,7 +6197,7 @@
 
 fi
 
-echo "$as_me:6196: checking for XFree86 in /usr/X386" >&5
+echo "$as_me:6200: checking for XFree86 in /usr/X386" >&5
 echo $ECHO_N "checking for XFree86 in /usr/X386... $ECHO_C" >&6
 if test -d /usr/X386/include; then
   HAVE_XFREE386=yes
@@ -6201,7 +6205,7 @@
 else
   HAVE_XFREE386=no
 fi
-echo "$as_me:6204: result: $HAVE_XFREE386" >&5
+echo "$as_me:6208: result: $HAVE_XFREE386" >&5
 echo "${ECHO_T}$HAVE_XFREE386" >&6
 
 # Change CFLAGS temporarily so that C_SWITCH_X_SITE gets used
@@ -6226,10 +6230,10 @@
   fi
 
   if test "${opsys}" = "gnu-linux"; then
-    echo "$as_me:6229: checking whether X on GNU/Linux needs -b to link" >&5
+    echo "$as_me:6233: checking whether X on GNU/Linux needs -b to link" >&5
 echo $ECHO_N "checking whether X on GNU/Linux needs -b to link... $ECHO_C" >&6
     cat >conftest.$ac_ext <<_ACEOF
-#line 6232 "configure"
+#line 6236 "configure"
 #include "confdefs.h"
 
 int
@@ -6241,16 +6245,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6244: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6247: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6248: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6251: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6250: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6253: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6254: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6257: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   xlinux_first_failure=no
 else
@@ -6269,7 +6273,7 @@
       CPPFLAGS="$CPPFLAGS -b i486-linuxaout"
       LIBS="$LIBS -b i486-linuxaout"
       cat >conftest.$ac_ext <<_ACEOF
-#line 6272 "configure"
+#line 6276 "configure"
 #include "confdefs.h"
 
 int
@@ -6281,16 +6285,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6284: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6287: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6288: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6291: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6290: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6293: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6294: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6297: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   xlinux_second_failure=no
 else
@@ -6306,24 +6310,24 @@
 	C_SWITCH_X_SITE="$OLD_C_SWITCH_X_SITE"
 	CPPFLAGS="$OLD_CPPFLAGS"
 	LIBS="$OLD_LIBS"
-        echo "$as_me:6309: result: no" >&5
+        echo "$as_me:6313: result: no" >&5
 echo "${ECHO_T}no" >&6
       else
-        echo "$as_me:6312: result: yes" >&5
+        echo "$as_me:6316: result: yes" >&5
 echo "${ECHO_T}yes" >&6
       fi
     else
-      echo "$as_me:6316: result: no" >&5
+      echo "$as_me:6320: result: no" >&5
 echo "${ECHO_T}no" >&6
     fi
   fi
 
   # Reportedly, some broken Solaris systems have XKBlib.h but are missing
   # header files included from there.
-  echo "$as_me:6323: checking for Xkb" >&5
+  echo "$as_me:6327: checking for Xkb" >&5
 echo $ECHO_N "checking for Xkb... $ECHO_C" >&6
   cat >conftest.$ac_ext <<_ACEOF
-#line 6326 "configure"
+#line 6330 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
@@ -6336,16 +6340,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6339: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6342: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6343: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6346: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6345: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6348: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6349: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6352: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_xkb=yes
 else
@@ -6354,7 +6358,7 @@
 emacs_xkb=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  echo "$as_me:6357: result: $emacs_xkb" >&5
+  echo "$as_me:6361: result: $emacs_xkb" >&5
 echo "${ECHO_T}$emacs_xkb" >&6
   if test $emacs_xkb = yes; then
 
@@ -6368,13 +6372,13 @@
 XScreenNumberOfScreen XSetWMProtocols
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6371: checking for $ac_func" >&5
+echo "$as_me:6375: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6377 "configure"
+#line 6381 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6405,16 +6409,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6408: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6411: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6412: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6415: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6414: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6417: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6418: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6421: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6424,7 +6428,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6427: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6431: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -6437,13 +6441,13 @@
 fi
 
 if test "${window_system}" = "x11"; then
-  echo "$as_me:6440: checking X11 version 6" >&5
+  echo "$as_me:6444: checking X11 version 6" >&5
 echo $ECHO_N "checking X11 version 6... $ECHO_C" >&6
   if test "${emacs_cv_x11_version_6+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6446 "configure"
+#line 6450 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 int
@@ -6458,16 +6462,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6461: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6464: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6465: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6468: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6467: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6470: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6471: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6474: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_x11_version_6=yes
 else
@@ -6479,7 +6483,7 @@
 fi
 
   if test $emacs_cv_x11_version_6 = yes; then
-    echo "$as_me:6482: result: 6 or newer" >&5
+    echo "$as_me:6486: result: 6 or newer" >&5
 echo "${ECHO_T}6 or newer" >&6
 
 cat >>confdefs.h <<\EOF
@@ -6487,19 +6491,19 @@
 EOF
 
   else
-    echo "$as_me:6490: result: before 6" >&5
+    echo "$as_me:6494: result: before 6" >&5
 echo "${ECHO_T}before 6" >&6
   fi
 fi
 
 if test "${window_system}" = "x11"; then
-  echo "$as_me:6496: checking X11 version 5" >&5
+  echo "$as_me:6500: checking X11 version 5" >&5
 echo $ECHO_N "checking X11 version 5... $ECHO_C" >&6
   if test "${emacs_cv_x11_version_5+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6502 "configure"
+#line 6506 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 int
@@ -6514,16 +6518,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6517: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6520: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6521: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6524: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6523: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6526: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6527: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6530: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_x11_version_5=yes
 else
@@ -6535,7 +6539,7 @@
 fi
 
   if test $emacs_cv_x11_version_5 = yes; then
-    echo "$as_me:6538: result: 5 or newer" >&5
+    echo "$as_me:6542: result: 5 or newer" >&5
 echo "${ECHO_T}5 or newer" >&6
     HAVE_X11R5=yes
 
@@ -6545,20 +6549,20 @@
 
   else
     HAVE_X11R5=no
-    echo "$as_me:6548: result: before 5" >&5
+    echo "$as_me:6552: result: before 5" >&5
 echo "${ECHO_T}before 5" >&6
   fi
 fi
 
 if test x"${USE_X_TOOLKIT}" = xmaybe; then
   if test x"${HAVE_X11R5}" = xyes; then
-    echo "$as_me:6555: checking X11 version 5 with Xaw" >&5
+    echo "$as_me:6559: checking X11 version 5 with Xaw" >&5
 echo $ECHO_N "checking X11 version 5 with Xaw... $ECHO_C" >&6
     if test "${emacs_cv_x11_version_5_with_xaw+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6561 "configure"
+#line 6565 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -6572,16 +6576,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6575: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6578: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6579: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6582: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6581: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6584: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6585: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6588: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_x11_version_5_with_xaw=yes
 else
@@ -6593,11 +6597,11 @@
 fi
 
     if test $emacs_cv_x11_version_5_with_xaw = yes; then
-      echo "$as_me:6596: result: 5 or newer, with Xaw; use toolkit by default" >&5
+      echo "$as_me:6600: result: 5 or newer, with Xaw; use toolkit by default" >&5
 echo "${ECHO_T}5 or newer, with Xaw; use toolkit by default" >&6
       USE_X_TOOLKIT=LUCID
     else
-      echo "$as_me:6600: result: before 5 or no Xaw; do not use toolkit by default" >&5
+      echo "$as_me:6604: result: before 5 or no Xaw; do not use toolkit by default" >&5
 echo "${ECHO_T}before 5 or no Xaw; do not use toolkit by default" >&6
       USE_X_TOOLKIT=none
     fi
@@ -6609,13 +6613,13 @@
 X_TOOLKIT_TYPE=$USE_X_TOOLKIT
 
 if test "${USE_X_TOOLKIT}" != "none"; then
-  echo "$as_me:6612: checking X11 toolkit version" >&5
+  echo "$as_me:6616: checking X11 toolkit version" >&5
 echo $ECHO_N "checking X11 toolkit version... $ECHO_C" >&6
   if test "${emacs_cv_x11_toolkit_version_6+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6618 "configure"
+#line 6622 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -6630,16 +6634,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6633: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6636: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6637: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6640: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6639: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6642: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6643: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6646: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_x11_toolkit_version_6=yes
 else
@@ -6652,7 +6656,7 @@
 
   HAVE_X11XTR6=$emacs_cv_x11_toolkit_version_6
   if test $emacs_cv_x11_toolkit_version_6 = yes; then
-    echo "$as_me:6655: result: 6 or newer" >&5
+    echo "$as_me:6659: result: 6 or newer" >&5
 echo "${ECHO_T}6 or newer" >&6
 
 cat >>confdefs.h <<\EOF
@@ -6660,7 +6664,7 @@
 EOF
 
   else
-    echo "$as_me:6663: result: before 6" >&5
+    echo "$as_me:6667: result: before 6" >&5
 echo "${ECHO_T}before 6" >&6
   fi
 
@@ -6671,7 +6675,7 @@
     LIBS="-lXt $LIBS"
   fi
 
-echo "$as_me:6674: checking for XmuConvertStandardSelection in -lXmu" >&5
+echo "$as_me:6678: checking for XmuConvertStandardSelection in -lXmu" >&5
 echo $ECHO_N "checking for XmuConvertStandardSelection in -lXmu... $ECHO_C" >&6
 if test "${ac_cv_lib_Xmu_XmuConvertStandardSelection+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6679,7 +6683,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXmu  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6682 "configure"
+#line 6686 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6698,16 +6702,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6701: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6704: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6705: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6708: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6707: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6710: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6711: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6714: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xmu_XmuConvertStandardSelection=yes
 else
@@ -6718,7 +6722,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6721: result: $ac_cv_lib_Xmu_XmuConvertStandardSelection" >&5
+echo "$as_me:6725: result: $ac_cv_lib_Xmu_XmuConvertStandardSelection" >&5
 echo "${ECHO_T}$ac_cv_lib_Xmu_XmuConvertStandardSelection" >&6
 if test $ac_cv_lib_Xmu_XmuConvertStandardSelection = yes; then
   cat >>confdefs.h <<EOF
@@ -6736,7 +6740,7 @@
 if test "${HAVE_X11}" = "yes"; then
   if test "${USE_X_TOOLKIT}" != "none"; then
 
-echo "$as_me:6739: checking for XShapeQueryExtension in -lXext" >&5
+echo "$as_me:6743: checking for XShapeQueryExtension in -lXext" >&5
 echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6
 if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6744,7 +6748,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6747 "configure"
+#line 6751 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6763,16 +6767,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6766: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6769: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6770: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6773: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6772: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6775: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6776: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6779: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XShapeQueryExtension=yes
 else
@@ -6783,7 +6787,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6786: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
+echo "$as_me:6790: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
 echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6
 if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then
   cat >>confdefs.h <<EOF
@@ -6798,13 +6802,56 @@
 fi
 
 if test "${USE_X_TOOLKIT}" = "MOTIF"; then
-  echo "$as_me:6801: checking for Motif version 2.1" >&5
+  echo "$as_me:6805: checking for LessTif where some systems put it" >&5
+echo $ECHO_N "checking for LessTif where some systems put it... $ECHO_C" >&6
+if test "${emacs_cv_lesstif+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 6811 "configure"
+#include "confdefs.h"
+#include </usr/X11R6/LessTif/Motif1.2/include/Xm/Xm.h>
+int
+main ()
+{
+int x = 5;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:6823: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:6826: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:6829: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6832: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  emacs_cv_lesstif=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+emacs_cv_lesstif=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:6842: result: $emacs_cv_lesstif" >&5
+echo "${ECHO_T}$emacs_cv_lesstif" >&6
+  if test $emacs_cv_lesstif = yes; then
+    CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CPPFLAGS"
+    LDFLAGS="-L/usr/X11R6/LessTif/Motif1.2/lib $LDFLAGS"
+  fi
+  echo "$as_me:6848: checking for Motif version 2.1" >&5
 echo $ECHO_N "checking for Motif version 2.1... $ECHO_C" >&6
 if test "${emacs_cv_motif_version_2_1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6807 "configure"
+#line 6854 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 int
@@ -6820,16 +6867,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6823: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6870: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6826: \$? = $ac_status" >&5
+  echo "$as_me:6873: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6829: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6832: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6876: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6879: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_motif_version_2_1=yes
 else
@@ -6839,7 +6886,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6842: result: $emacs_cv_motif_version_2_1" >&5
+echo "$as_me:6889: result: $emacs_cv_motif_version_2_1" >&5
 echo "${ECHO_T}$emacs_cv_motif_version_2_1" >&6
   HAVE_MOTIF_2_1=$emacs_cv_motif_version_2_1
   if test $emacs_cv_motif_version_2_1 = yes; then
@@ -6849,7 +6896,7 @@
 #define HAVE_MOTIF_2_1 1
 EOF
 
-    echo "$as_me:6852: checking for XpCreateContext in -lXp" >&5
+    echo "$as_me:6899: checking for XpCreateContext in -lXp" >&5
 echo $ECHO_N "checking for XpCreateContext in -lXp... $ECHO_C" >&6
 if test "${ac_cv_lib_Xp_XpCreateContext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6857,7 +6904,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXp  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6860 "configure"
+#line 6907 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6876,16 +6923,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6879: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6882: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6926: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6929: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6885: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6888: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6932: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6935: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xp_XpCreateContext=yes
 else
@@ -6896,7 +6943,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6899: result: $ac_cv_lib_Xp_XpCreateContext" >&5
+echo "$as_me:6946: result: $ac_cv_lib_Xp_XpCreateContext" >&5
 echo "${ECHO_T}$ac_cv_lib_Xp_XpCreateContext" >&6
 if test $ac_cv_lib_Xp_XpCreateContext = yes; then
   HAVE_LIBXP=yes
@@ -6916,23 +6963,23 @@
 HAVE_XAW3D=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${USE_X_TOOLKIT}" != "none"; then
-    echo "$as_me:6919: checking for X11/Xaw3d/Scrollbar.h" >&5
+    echo "$as_me:6966: checking for X11/Xaw3d/Scrollbar.h" >&5
 echo $ECHO_N "checking for X11/Xaw3d/Scrollbar.h... $ECHO_C" >&6
 if test "${ac_cv_header_X11_Xaw3d_Scrollbar_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6925 "configure"
+#line 6972 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/Scrollbar.h>
 _ACEOF
-if { (eval echo "$as_me:6929: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6976: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6935: \$? = $ac_status" >&5
+  echo "$as_me:6982: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6951,10 +6998,10 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6954: result: $ac_cv_header_X11_Xaw3d_Scrollbar_h" >&5
+echo "$as_me:7001: result: $ac_cv_header_X11_Xaw3d_Scrollbar_h" >&5
 echo "${ECHO_T}$ac_cv_header_X11_Xaw3d_Scrollbar_h" >&6
 if test $ac_cv_header_X11_Xaw3d_Scrollbar_h = yes; then
-  echo "$as_me:6957: checking for XawScrollbarSetThumb in -lXaw3d" >&5
+  echo "$as_me:7004: checking for XawScrollbarSetThumb in -lXaw3d" >&5
 echo $ECHO_N "checking for XawScrollbarSetThumb in -lXaw3d... $ECHO_C" >&6
 if test "${ac_cv_lib_Xaw3d_XawScrollbarSetThumb+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6962,7 +7009,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXaw3d  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6965 "configure"
+#line 7012 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6981,16 +7028,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6984: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6987: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7031: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7034: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6990: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6993: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7037: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7040: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xaw3d_XawScrollbarSetThumb=yes
 else
@@ -7001,7 +7048,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7004: result: $ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&5
+echo "$as_me:7051: result: $ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&5
 echo "${ECHO_T}$ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&6
 if test $ac_cv_lib_Xaw3d_XawScrollbarSetThumb = yes; then
   HAVE_XAW3D=yes
@@ -7051,23 +7098,23 @@
 HAVE_XPM=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${with_xpm}" != "no"; then
-    echo "$as_me:7054: checking for X11/xpm.h" >&5
+    echo "$as_me:7101: checking for X11/xpm.h" >&5
 echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6
 if test "${ac_cv_header_X11_xpm_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7060 "configure"
+#line 7107 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 _ACEOF
-if { (eval echo "$as_me:7064: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7111: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7070: \$? = $ac_status" >&5
+  echo "$as_me:7117: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7086,10 +7133,10 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7089: result: $ac_cv_header_X11_xpm_h" >&5
+echo "$as_me:7136: result: $ac_cv_header_X11_xpm_h" >&5
 echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6
 if test $ac_cv_header_X11_xpm_h = yes; then
-  echo "$as_me:7092: checking for XpmReadFileToPixmap in -lXpm" >&5
+  echo "$as_me:7139: checking for XpmReadFileToPixmap in -lXpm" >&5
 echo $ECHO_N "checking for XpmReadFileToPixmap in -lXpm... $ECHO_C" >&6
 if test "${ac_cv_lib_Xpm_XpmReadFileToPixmap+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7097,7 +7144,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm -lX11 $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7100 "configure"
+#line 7147 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7116,16 +7163,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7119: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7122: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7166: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7169: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7125: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7128: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7172: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7175: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xpm_XpmReadFileToPixmap=yes
 else
@@ -7136,7 +7183,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7139: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5
+echo "$as_me:7186: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5
 echo "${ECHO_T}$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&6
 if test $ac_cv_lib_Xpm_XpmReadFileToPixmap = yes; then
   HAVE_XPM=yes
@@ -7145,10 +7192,10 @@
 fi
 
     if test "${HAVE_XPM}" = "yes"; then
-      echo "$as_me:7148: checking for XpmReturnAllocPixels preprocessor define" >&5
+      echo "$as_me:7195: checking for XpmReturnAllocPixels preprocessor define" >&5
 echo $ECHO_N "checking for XpmReturnAllocPixels preprocessor define... $ECHO_C" >&6
       cat >conftest.$ac_ext <<_ACEOF
-#line 7151 "configure"
+#line 7198 "configure"
 #include "confdefs.h"
 #include "X11/xpm.h"
 #ifndef XpmReturnAllocPixels
@@ -7165,10 +7212,10 @@
 rm -f conftest*
 
       if test "${HAVE_XPM}" = "yes"; then
-	echo "$as_me:7168: result: yes" >&5
+	echo "$as_me:7215: result: yes" >&5
 echo "${ECHO_T}yes" >&6
       else
-	echo "$as_me:7171: result: no" >&5
+	echo "$as_me:7218: result: no" >&5
 echo "${ECHO_T}no" >&6
       fi
     fi
@@ -7187,23 +7234,23 @@
 HAVE_JPEG=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${with_jpeg}" != "no"; then
-            echo "$as_me:7190: checking for jerror.h" >&5
+            echo "$as_me:7237: checking for jerror.h" >&5
 echo $ECHO_N "checking for jerror.h... $ECHO_C" >&6
 if test "${ac_cv_header_jerror_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7196 "configure"
+#line 7243 "configure"
 #include "confdefs.h"
 #include <jerror.h>
 _ACEOF
-if { (eval echo "$as_me:7200: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7247: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7206: \$? = $ac_status" >&5
+  echo "$as_me:7253: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7222,10 +7269,10 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7225: result: $ac_cv_header_jerror_h" >&5
+echo "$as_me:7272: result: $ac_cv_header_jerror_h" >&5
 echo "${ECHO_T}$ac_cv_header_jerror_h" >&6
 if test $ac_cv_header_jerror_h = yes; then
-  echo "$as_me:7228: checking for jpeg_destroy_compress in -ljpeg" >&5
+  echo "$as_me:7275: checking for jpeg_destroy_compress in -ljpeg" >&5
 echo $ECHO_N "checking for jpeg_destroy_compress in -ljpeg... $ECHO_C" >&6
 if test "${ac_cv_lib_jpeg_jpeg_destroy_compress+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7233,7 +7280,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljpeg  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7236 "configure"
+#line 7283 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7252,16 +7299,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7255: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7258: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7302: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7305: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7261: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7264: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7308: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7311: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_jpeg_jpeg_destroy_compress=yes
 else
@@ -7272,7 +7319,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7275: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5
+echo "$as_me:7322: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5
 echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6
 if test $ac_cv_lib_jpeg_jpeg_destroy_compress = yes; then
   HAVE_JPEG=yes
@@ -7288,7 +7335,7 @@
 EOF
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 7291 "configure"
+#line 7338 "configure"
 #include "confdefs.h"
         #include <jpeglib.h>
 	 version=JPEG_LIB_VERSION
@@ -7301,7 +7348,7 @@
 EOF
 
 else
-  { echo "$as_me:7304: WARNING: libjpeg found, but not version 6b or later" >&5
+  { echo "$as_me:7351: WARNING: libjpeg found, but not version 6b or later" >&5
 echo "$as_me: WARNING: libjpeg found, but not version 6b or later" >&2;}
         HAVE_JPEG=no
 fi
@@ -7314,23 +7361,23 @@
 HAVE_PNG=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${with_png}" != "no"; then
-    echo "$as_me:7317: checking for png.h" >&5
+    echo "$as_me:7364: checking for png.h" >&5
 echo $ECHO_N "checking for png.h... $ECHO_C" >&6
 if test "${ac_cv_header_png_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7323 "configure"
+#line 7370 "configure"
 #include "confdefs.h"
 #include <png.h>
 _ACEOF
-if { (eval echo "$as_me:7327: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7374: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7333: \$? = $ac_status" >&5
+  echo "$as_me:7380: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7349,10 +7396,10 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7352: result: $ac_cv_header_png_h" >&5
+echo "$as_me:7399: result: $ac_cv_header_png_h" >&5
 echo "${ECHO_T}$ac_cv_header_png_h" >&6
 if test $ac_cv_header_png_h = yes; then
-  echo "$as_me:7355: checking for png_get_channels in -lpng" >&5
+  echo "$as_me:7402: checking for png_get_channels in -lpng" >&5
 echo $ECHO_N "checking for png_get_channels in -lpng... $ECHO_C" >&6
 if test "${ac_cv_lib_png_png_get_channels+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7360,7 +7407,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpng -lz -lm $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7363 "configure"
+#line 7410 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7379,16 +7426,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7382: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7385: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7429: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7432: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7388: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7391: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7435: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7438: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_png_png_get_channels=yes
 else
@@ -7399,7 +7446,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7402: result: $ac_cv_lib_png_png_get_channels" >&5
+echo "$as_me:7449: result: $ac_cv_lib_png_png_get_channels" >&5
 echo "${ECHO_T}$ac_cv_lib_png_png_get_channels" >&6
 if test $ac_cv_lib_png_png_get_channels = yes; then
   HAVE_PNG=yes
@@ -7422,23 +7469,23 @@
 HAVE_TIFF=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${with_tiff}" != "no"; then
-    echo "$as_me:7425: checking for tiffio.h" >&5
+    echo "$as_me:7472: checking for tiffio.h" >&5
 echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6
 if test "${ac_cv_header_tiffio_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7431 "configure"
+#line 7478 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 _ACEOF
-if { (eval echo "$as_me:7435: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7482: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7441: \$? = $ac_status" >&5
+  echo "$as_me:7488: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7457,13 +7504,13 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7460: result: $ac_cv_header_tiffio_h" >&5
+echo "$as_me:7507: result: $ac_cv_header_tiffio_h" >&5
 echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6
 if test $ac_cv_header_tiffio_h = yes; then
   tifflibs="-lz -lm"
       # At least one tiff package requires the jpeg library.
       if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi
-      echo "$as_me:7466: checking for TIFFGetVersion in -ltiff" >&5
+      echo "$as_me:7513: checking for TIFFGetVersion in -ltiff" >&5
 echo $ECHO_N "checking for TIFFGetVersion in -ltiff... $ECHO_C" >&6
 if test "${ac_cv_lib_tiff_TIFFGetVersion+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7471,7 +7518,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltiff $tifflibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7474 "configure"
+#line 7521 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7490,16 +7537,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7493: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7496: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7540: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7543: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7499: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7502: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7546: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7549: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_tiff_TIFFGetVersion=yes
 else
@@ -7510,7 +7557,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7513: result: $ac_cv_lib_tiff_TIFFGetVersion" >&5
+echo "$as_me:7560: result: $ac_cv_lib_tiff_TIFFGetVersion" >&5
 echo "${ECHO_T}$ac_cv_lib_tiff_TIFFGetVersion" >&6
 if test $ac_cv_lib_tiff_TIFFGetVersion = yes; then
   HAVE_TIFF=yes
@@ -7533,23 +7580,23 @@
 HAVE_GIF=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${with_gif}" != "no"; then
-    echo "$as_me:7536: checking for gif_lib.h" >&5
+    echo "$as_me:7583: checking for gif_lib.h" >&5
 echo $ECHO_N "checking for gif_lib.h... $ECHO_C" >&6
 if test "${ac_cv_header_gif_lib_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7542 "configure"
+#line 7589 "configure"
 #include "confdefs.h"
 #include <gif_lib.h>
 _ACEOF
-if { (eval echo "$as_me:7546: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7593: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7552: \$? = $ac_status" >&5
+  echo "$as_me:7599: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7568,12 +7615,12 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7571: result: $ac_cv_header_gif_lib_h" >&5
+echo "$as_me:7618: result: $ac_cv_header_gif_lib_h" >&5
 echo "${ECHO_T}$ac_cv_header_gif_lib_h" >&6
 if test $ac_cv_header_gif_lib_h = yes; then
   # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
 # Earlier versions can crash Emacs.
-      echo "$as_me:7576: checking for EGifPutExtensionLast in -lungif" >&5
+      echo "$as_me:7623: checking for EGifPutExtensionLast in -lungif" >&5
 echo $ECHO_N "checking for EGifPutExtensionLast in -lungif... $ECHO_C" >&6
 if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7581,7 +7628,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lungif  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7584 "configure"
+#line 7631 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7600,16 +7647,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7603: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7606: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7650: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7653: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7609: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7612: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7656: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7659: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ungif_EGifPutExtensionLast=yes
 else
@@ -7620,7 +7667,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7623: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
+echo "$as_me:7670: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
 echo "${ECHO_T}$ac_cv_lib_ungif_EGifPutExtensionLast" >&6
 if test $ac_cv_lib_ungif_EGifPutExtensionLast = yes; then
   HAVE_GIF=yes
@@ -7642,23 +7689,23 @@
 ### Use Mac OS X Carbon API to implement GUI.
 HAVE_CARBON=no
 if test "${with_carbon}" != "no"; then
-  echo "$as_me:7645: checking for Carbon/Carbon.h" >&5
+  echo "$as_me:7692: checking for Carbon/Carbon.h" >&5
 echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6
 if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7651 "configure"
+#line 7698 "configure"
 #include "confdefs.h"
 #include <Carbon/Carbon.h>
 _ACEOF
-if { (eval echo "$as_me:7655: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7702: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7661: \$? = $ac_status" >&5
+  echo "$as_me:7708: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7677,7 +7724,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7680: result: $ac_cv_header_Carbon_Carbon_h" >&5
+echo "$as_me:7727: result: $ac_cv_header_Carbon_Carbon_h" >&5
 echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6
 if test $ac_cv_header_Carbon_Carbon_h = yes; then
   HAVE_CARBON=yes
@@ -7696,23 +7743,23 @@
 ### Use session management (-lSM -lICE) if available
 HAVE_X_SM=no
 if test "${HAVE_X11}" = "yes"; then
-  echo "$as_me:7699: checking for X11/SM/SMlib.h" >&5
+  echo "$as_me:7746: checking for X11/SM/SMlib.h" >&5
 echo $ECHO_N "checking for X11/SM/SMlib.h... $ECHO_C" >&6
 if test "${ac_cv_header_X11_SM_SMlib_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7705 "configure"
+#line 7752 "configure"
 #include "confdefs.h"
 #include <X11/SM/SMlib.h>
 _ACEOF
-if { (eval echo "$as_me:7709: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7756: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7715: \$? = $ac_status" >&5
+  echo "$as_me:7762: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7731,10 +7778,10 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7734: result: $ac_cv_header_X11_SM_SMlib_h" >&5
+echo "$as_me:7781: result: $ac_cv_header_X11_SM_SMlib_h" >&5
 echo "${ECHO_T}$ac_cv_header_X11_SM_SMlib_h" >&6
 if test $ac_cv_header_X11_SM_SMlib_h = yes; then
-  echo "$as_me:7737: checking for SmcOpenConnection in -lSM" >&5
+  echo "$as_me:7784: checking for SmcOpenConnection in -lSM" >&5
 echo $ECHO_N "checking for SmcOpenConnection in -lSM... $ECHO_C" >&6
 if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7742,7 +7789,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lSM  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7745 "configure"
+#line 7792 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7761,16 +7808,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7764: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7767: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7811: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7814: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7770: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7773: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7817: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7820: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_SM_SmcOpenConnection=yes
 else
@@ -7781,7 +7828,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7784: result: $ac_cv_lib_SM_SmcOpenConnection" >&5
+echo "$as_me:7831: result: $ac_cv_lib_SM_SmcOpenConnection" >&5
 echo "${ECHO_T}$ac_cv_lib_SM_SmcOpenConnection" >&6
 if test $ac_cv_lib_SM_SmcOpenConnection = yes; then
   HAVE_X_SM=yes
@@ -7805,13 +7852,13 @@
 fi
 
 # If netdb.h doesn't declare h_errno, we must declare it by hand.
-echo "$as_me:7808: checking whether netdb declares h_errno" >&5
+echo "$as_me:7855: checking whether netdb declares h_errno" >&5
 echo $ECHO_N "checking whether netdb declares h_errno... $ECHO_C" >&6
 if test "${emacs_cv_netdb_declares_h_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7814 "configure"
+#line 7861 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int
@@ -7823,16 +7870,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7826: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7829: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7873: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7876: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7832: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7835: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7879: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7882: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_netdb_declares_h_errno=yes
 else
@@ -7842,7 +7889,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7845: result: $emacs_cv_netdb_declares_h_errno" >&5
+echo "$as_me:7892: result: $emacs_cv_netdb_declares_h_errno" >&5
 echo "${ECHO_T}$emacs_cv_netdb_declares_h_errno" >&6
 if test $emacs_cv_netdb_declares_h_errno = yes; then
 
@@ -7854,13 +7901,13 @@
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:7857: checking for working alloca.h" >&5
+echo "$as_me:7904: checking for working alloca.h" >&5
 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
 if test "${ac_cv_working_alloca_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7863 "configure"
+#line 7910 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -7872,16 +7919,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7875: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7878: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7922: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7925: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7881: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7884: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7928: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7931: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -7891,7 +7938,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7894: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:7941: result: $ac_cv_working_alloca_h" >&5
 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
 if test $ac_cv_working_alloca_h = yes; then
 
@@ -7901,13 +7948,13 @@
 
 fi
 
-echo "$as_me:7904: checking for alloca" >&5
+echo "$as_me:7951: checking for alloca" >&5
 echo $ECHO_N "checking for alloca... $ECHO_C" >&6
 if test "${ac_cv_func_alloca_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7910 "configure"
+#line 7957 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -7939,16 +7986,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7942: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7945: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7989: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7992: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7948: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7951: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7995: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7998: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -7958,7 +8005,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7961: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:8008: result: $ac_cv_func_alloca_works" >&5
 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
 if test $ac_cv_func_alloca_works = yes; then
@@ -7979,13 +8026,13 @@
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:7982: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:8029: checking whether \`alloca.c' needs Cray hooks" >&5
 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
 if test "${ac_cv_os_cray+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7988 "configure"
+#line 8035 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -8003,18 +8050,18 @@
 rm -f conftest*
 
 fi
-echo "$as_me:8006: result: $ac_cv_os_cray" >&5
+echo "$as_me:8053: result: $ac_cv_os_cray" >&5
 echo "${ECHO_T}$ac_cv_os_cray" >&6
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8011: checking for $ac_func" >&5
+echo "$as_me:8058: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8017 "configure"
+#line 8064 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8045,16 +8092,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8048: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8051: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8095: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8098: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8054: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8057: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8101: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8104: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8064,7 +8111,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8067: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8114: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
 
@@ -8078,7 +8125,7 @@
   done
 fi
 
-echo "$as_me:8081: checking stack direction for C alloca" >&5
+echo "$as_me:8128: checking stack direction for C alloca" >&5
 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
 if test "${ac_cv_c_stack_direction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8087,7 +8134,7 @@
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8090 "configure"
+#line 8137 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -8110,15 +8157,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8113: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8116: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8160: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8163: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8118: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8121: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8165: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8168: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -8130,7 +8177,7 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:8133: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:8180: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -8142,7 +8189,7 @@
 # fmod, logb, and frexp are found in -lm on most systems.
 # On HPUX 9.01, -lm does not contain logb, so check for sqrt.
 
-echo "$as_me:8145: checking for sqrt in -lm" >&5
+echo "$as_me:8192: checking for sqrt in -lm" >&5
 echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6
 if test "${ac_cv_lib_m_sqrt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8150,7 +8197,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8153 "configure"
+#line 8200 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8169,16 +8216,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8172: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8175: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8219: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8222: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8178: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8181: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8225: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8228: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_sqrt=yes
 else
@@ -8189,7 +8236,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8192: result: $ac_cv_lib_m_sqrt" >&5
+echo "$as_me:8239: result: $ac_cv_lib_m_sqrt" >&5
 echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6
 if test $ac_cv_lib_m_sqrt = yes; then
   cat >>confdefs.h <<EOF
@@ -8202,7 +8249,7 @@
 
 # Check for mail-locking functions in a "mail" library
 
-echo "$as_me:8205: checking for maillock in -lmail" >&5
+echo "$as_me:8252: checking for maillock in -lmail" >&5
 echo $ECHO_N "checking for maillock in -lmail... $ECHO_C" >&6
 if test "${ac_cv_lib_mail_maillock+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8210,7 +8257,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmail  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8213 "configure"
+#line 8260 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8229,16 +8276,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8232: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8235: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8279: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8282: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8238: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8241: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8285: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8288: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mail_maillock=yes
 else
@@ -8249,7 +8296,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8252: result: $ac_cv_lib_mail_maillock" >&5
+echo "$as_me:8299: result: $ac_cv_lib_mail_maillock" >&5
 echo "${ECHO_T}$ac_cv_lib_mail_maillock" >&6
 if test $ac_cv_lib_mail_maillock = yes; then
   cat >>confdefs.h <<EOF
@@ -8260,7 +8307,7 @@
 
 fi
 
-echo "$as_me:8263: checking for maillock in -llockfile" >&5
+echo "$as_me:8310: checking for maillock in -llockfile" >&5
 echo $ECHO_N "checking for maillock in -llockfile... $ECHO_C" >&6
 if test "${ac_cv_lib_lockfile_maillock+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8268,7 +8315,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-llockfile  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8271 "configure"
+#line 8318 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8287,16 +8334,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8290: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8293: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8337: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8340: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8296: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8299: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8343: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8346: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_lockfile_maillock=yes
 else
@@ -8307,7 +8354,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8310: result: $ac_cv_lib_lockfile_maillock" >&5
+echo "$as_me:8357: result: $ac_cv_lib_lockfile_maillock" >&5
 echo "${ECHO_T}$ac_cv_lib_lockfile_maillock" >&6
 if test $ac_cv_lib_lockfile_maillock = yes; then
   cat >>confdefs.h <<EOF
@@ -8324,7 +8371,7 @@
 if test "$ac_cv_lib_lockfile_maillock" = no; then
       # Extract the first word of "liblockfile.so", so it can be a program name with args.
 set dummy liblockfile.so; ac_word=$2
-echo "$as_me:8327: checking for $ac_word" >&5
+echo "$as_me:8374: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_liblockfile+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8339,7 +8386,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_liblockfile="yes"
-echo "$as_me:8342: found $ac_dir/$ac_word" >&5
+echo "$as_me:8389: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8348,15 +8395,15 @@
 fi
 liblockfile=$ac_cv_prog_liblockfile
 if test -n "$liblockfile"; then
-  echo "$as_me:8351: result: $liblockfile" >&5
+  echo "$as_me:8398: result: $liblockfile" >&5
 echo "${ECHO_T}$liblockfile" >&6
 else
-  echo "$as_me:8354: result: no" >&5
+  echo "$as_me:8401: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   if test $ac_cv_prog_liblockfile = yes; then
-    { { echo "$as_me:8359: error: Shared liblockfile found but can't link against it.
+    { { echo "$as_me:8406: error: Shared liblockfile found but can't link against it.
 This probably means that movemail could lose mail.
 There may be a \`development' package to install containing liblockfile." >&5
 echo "$as_me: error: Shared liblockfile found but can't link against it.
@@ -8375,13 +8422,13 @@
 for ac_func in touchlock
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8378: checking for $ac_func" >&5
+echo "$as_me:8425: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8384 "configure"
+#line 8431 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8412,16 +8459,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8415: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8418: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8462: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8465: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8421: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8424: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8468: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8471: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8431,7 +8478,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8434: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8481: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8444,23 +8491,23 @@
 for ac_header in maillock.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8447: checking for $ac_header" >&5
+echo "$as_me:8494: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8453 "configure"
+#line 8500 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8457: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8504: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8463: \$? = $ac_status" >&5
+  echo "$as_me:8510: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8479,7 +8526,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8482: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8529: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8499,13 +8546,13 @@
 gai_strerror mkstemp getline getdelim
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8502: checking for $ac_func" >&5
+echo "$as_me:8549: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8508 "configure"
+#line 8555 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8536,16 +8583,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8539: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8542: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8586: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8589: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8545: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8548: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8592: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8595: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8555,7 +8602,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8558: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8605: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8568,23 +8615,23 @@
 for ac_header in sys/un.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8571: checking for $ac_header" >&5
+echo "$as_me:8618: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8577 "configure"
+#line 8624 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8581: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8628: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8587: \$? = $ac_status" >&5
+  echo "$as_me:8634: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8603,7 +8650,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8606: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8653: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8616,23 +8663,23 @@
 for ac_header in sys/time.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8619: checking for $ac_header" >&5
+echo "$as_me:8666: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8625 "configure"
+#line 8672 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8629: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8676: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8635: \$? = $ac_status" >&5
+  echo "$as_me:8682: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8651,7 +8698,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8654: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8701: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8664,13 +8711,13 @@
 for ac_func in alarm
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8667: checking for $ac_func" >&5
+echo "$as_me:8714: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8673 "configure"
+#line 8720 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8701,16 +8748,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8704: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8707: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8751: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8754: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8710: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8713: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8757: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8760: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8720,7 +8767,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8723: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8770: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8730,7 +8777,7 @@
 fi
 done
 
-echo "$as_me:8733: checking for working mktime" >&5
+echo "$as_me:8780: checking for working mktime" >&5
 echo $ECHO_N "checking for working mktime... $ECHO_C" >&6
 if test "${ac_cv_func_working_mktime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8739,7 +8786,7 @@
   ac_cv_func_working_mktime=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8742 "configure"
+#line 8789 "configure"
 #include "confdefs.h"
 /* Test program from Paul Eggert and Tony Leneis.  */
 #if TIME_WITH_SYS_TIME
@@ -8888,15 +8935,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8891: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8894: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8938: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8941: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8896: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8899: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8943: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8946: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_working_mktime=yes
 else
@@ -8908,7 +8955,7 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:8911: result: $ac_cv_func_working_mktime" >&5
+echo "$as_me:8958: result: $ac_cv_func_working_mktime" >&5
 echo "${ECHO_T}$ac_cv_func_working_mktime" >&6
 if test $ac_cv_func_working_mktime = no; then
   LIBOBJS="$LIBOBJS mktime.$ac_objext"
@@ -8927,13 +8974,13 @@
 ac_save_LIBS=$LIBS
 
 # Check for getloadavg, but be sure not to touch the cache variable.
-(echo "$as_me:8930: checking for getloadavg" >&5
+(echo "$as_me:8977: checking for getloadavg" >&5
 echo $ECHO_N "checking for getloadavg... $ECHO_C" >&6
 if test "${ac_cv_func_getloadavg+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8936 "configure"
+#line 8983 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getloadavg (); below.  */
@@ -8964,16 +9011,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8967: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8970: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9014: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9017: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8973: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8976: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9020: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9023: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getloadavg=yes
 else
@@ -8983,7 +9030,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8986: result: $ac_cv_func_getloadavg" >&5
+echo "$as_me:9033: result: $ac_cv_func_getloadavg" >&5
 echo "${ECHO_T}$ac_cv_func_getloadavg" >&6
 if test $ac_cv_func_getloadavg = yes; then
   exit 0
@@ -8997,13 +9044,13 @@
 for ac_func in pstat_getdynamic
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9000: checking for $ac_func" >&5
+echo "$as_me:9047: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9006 "configure"
+#line 9053 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9034,16 +9081,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9037: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9040: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9084: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9087: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9043: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9046: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9090: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9093: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9053,7 +9100,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9056: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9103: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9065,7 +9112,7 @@
 
 # Solaris has libkstat which does not require root.
 
-echo "$as_me:9068: checking for kstat_open in -lkstat" >&5
+echo "$as_me:9115: checking for kstat_open in -lkstat" >&5
 echo $ECHO_N "checking for kstat_open in -lkstat... $ECHO_C" >&6
 if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9073,7 +9120,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkstat  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9076 "configure"
+#line 9123 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9092,16 +9139,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9095: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9098: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9142: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9145: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9101: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9104: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9148: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9151: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_kstat_kstat_open=yes
 else
@@ -9112,7 +9159,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9115: result: $ac_cv_lib_kstat_kstat_open" >&5
+echo "$as_me:9162: result: $ac_cv_lib_kstat_kstat_open" >&5
 echo "${ECHO_T}$ac_cv_lib_kstat_kstat_open" >&6
 if test $ac_cv_lib_kstat_kstat_open = yes; then
   cat >>confdefs.h <<EOF
@@ -9130,7 +9177,7 @@
 # to get the right answer into the cache.
 # For kstat on solaris, we need libelf to force the definition of SVR4 below.
 if test $ac_have_func = no; then
-  echo "$as_me:9133: checking for elf_begin in -lelf" >&5
+  echo "$as_me:9180: checking for elf_begin in -lelf" >&5
 echo $ECHO_N "checking for elf_begin in -lelf... $ECHO_C" >&6
 if test "${ac_cv_lib_elf_elf_begin+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9138,7 +9185,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lelf  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9141 "configure"
+#line 9188 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9157,16 +9204,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9160: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9163: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9207: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9210: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9166: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9169: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9213: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9216: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_elf_elf_begin=yes
 else
@@ -9177,7 +9224,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9180: result: $ac_cv_lib_elf_elf_begin" >&5
+echo "$as_me:9227: result: $ac_cv_lib_elf_elf_begin" >&5
 echo "${ECHO_T}$ac_cv_lib_elf_elf_begin" >&6
 if test $ac_cv_lib_elf_elf_begin = yes; then
   LIBS="-lelf $LIBS"
@@ -9185,7 +9232,7 @@
 
 fi
 if test $ac_have_func = no; then
-  echo "$as_me:9188: checking for kvm_open in -lkvm" >&5
+  echo "$as_me:9235: checking for kvm_open in -lkvm" >&5
 echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6
 if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9193,7 +9240,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkvm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9196 "configure"
+#line 9243 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9212,16 +9259,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9215: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9218: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9262: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9265: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9221: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9224: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9268: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9271: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_kvm_kvm_open=yes
 else
@@ -9232,14 +9279,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9235: result: $ac_cv_lib_kvm_kvm_open" >&5
+echo "$as_me:9282: result: $ac_cv_lib_kvm_kvm_open" >&5
 echo "${ECHO_T}$ac_cv_lib_kvm_kvm_open" >&6
 if test $ac_cv_lib_kvm_kvm_open = yes; then
   LIBS="-lkvm $LIBS"
 fi
 
   # Check for the 4.4BSD definition of getloadavg.
-  echo "$as_me:9242: checking for getloadavg in -lutil" >&5
+  echo "$as_me:9289: checking for getloadavg in -lutil" >&5
 echo $ECHO_N "checking for getloadavg in -lutil... $ECHO_C" >&6
 if test "${ac_cv_lib_util_getloadavg+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9247,7 +9294,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9250 "configure"
+#line 9297 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9266,16 +9313,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9269: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9272: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9316: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9319: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9275: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9278: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9322: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9325: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_util_getloadavg=yes
 else
@@ -9286,7 +9333,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9289: result: $ac_cv_lib_util_getloadavg" >&5
+echo "$as_me:9336: result: $ac_cv_lib_util_getloadavg" >&5
 echo "${ECHO_T}$ac_cv_lib_util_getloadavg" >&6
 if test $ac_cv_lib_util_getloadavg = yes; then
   LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes
@@ -9299,7 +9346,7 @@
   # Since it is not a standard part of AIX, it might be installed locally.
   ac_getloadavg_LIBS=$LIBS
   LIBS="-L/usr/local/lib $LIBS"
-  echo "$as_me:9302: checking for getloadavg in -lgetloadavg" >&5
+  echo "$as_me:9349: checking for getloadavg in -lgetloadavg" >&5
 echo $ECHO_N "checking for getloadavg in -lgetloadavg... $ECHO_C" >&6
 if test "${ac_cv_lib_getloadavg_getloadavg+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9307,7 +9354,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgetloadavg  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9310 "configure"
+#line 9357 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9326,16 +9373,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9329: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9332: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9376: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9379: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9335: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9338: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9382: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9385: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_getloadavg_getloadavg=yes
 else
@@ -9346,7 +9393,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9349: result: $ac_cv_lib_getloadavg_getloadavg" >&5
+echo "$as_me:9396: result: $ac_cv_lib_getloadavg_getloadavg" >&5
 echo "${ECHO_T}$ac_cv_lib_getloadavg_getloadavg" >&6
 if test $ac_cv_lib_getloadavg_getloadavg = yes; then
   LIBS="-lgetloadavg $LIBS"
@@ -9362,13 +9409,13 @@
 for ac_func in getloadavg
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9365: checking for $ac_func" >&5
+echo "$as_me:9412: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9371 "configure"
+#line 9418 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9399,16 +9446,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9402: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9405: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9449: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9452: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9408: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9411: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9455: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9458: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9418,7 +9465,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9421: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9468: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9434,23 +9481,23 @@
 
 # Figure out what our getloadavg.c needs.
 ac_have_func=no
-echo "$as_me:9437: checking for sys/dg_sys_info.h" >&5
+echo "$as_me:9484: checking for sys/dg_sys_info.h" >&5
 echo $ECHO_N "checking for sys/dg_sys_info.h... $ECHO_C" >&6
 if test "${ac_cv_header_sys_dg_sys_info_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9443 "configure"
+#line 9490 "configure"
 #include "confdefs.h"
 #include <sys/dg_sys_info.h>
 _ACEOF
-if { (eval echo "$as_me:9447: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9494: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9453: \$? = $ac_status" >&5
+  echo "$as_me:9500: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9469,7 +9516,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9472: result: $ac_cv_header_sys_dg_sys_info_h" >&5
+echo "$as_me:9519: result: $ac_cv_header_sys_dg_sys_info_h" >&5
 echo "${ECHO_T}$ac_cv_header_sys_dg_sys_info_h" >&6
 if test $ac_cv_header_sys_dg_sys_info_h = yes; then
   ac_have_func=yes
@@ -9478,7 +9525,7 @@
 #define DGUX 1
 EOF
 
-echo "$as_me:9481: checking for dg_sys_info in -ldgc" >&5
+echo "$as_me:9528: checking for dg_sys_info in -ldgc" >&5
 echo $ECHO_N "checking for dg_sys_info in -ldgc... $ECHO_C" >&6
 if test "${ac_cv_lib_dgc_dg_sys_info+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9486,7 +9533,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldgc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9489 "configure"
+#line 9536 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9505,16 +9552,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9508: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9511: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9555: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9558: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9514: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9517: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9561: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9564: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dgc_dg_sys_info=yes
 else
@@ -9525,7 +9572,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9528: result: $ac_cv_lib_dgc_dg_sys_info" >&5
+echo "$as_me:9575: result: $ac_cv_lib_dgc_dg_sys_info" >&5
 echo "${ECHO_T}$ac_cv_lib_dgc_dg_sys_info" >&6
 if test $ac_cv_lib_dgc_dg_sys_info = yes; then
   cat >>confdefs.h <<EOF
@@ -9538,23 +9585,23 @@
 
 fi
 
-echo "$as_me:9541: checking for locale.h" >&5
+echo "$as_me:9588: checking for locale.h" >&5
 echo $ECHO_N "checking for locale.h... $ECHO_C" >&6
 if test "${ac_cv_header_locale_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9547 "configure"
+#line 9594 "configure"
 #include "confdefs.h"
 #include <locale.h>
 _ACEOF
-if { (eval echo "$as_me:9551: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9598: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9557: \$? = $ac_status" >&5
+  echo "$as_me:9604: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9573,19 +9620,19 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9576: result: $ac_cv_header_locale_h" >&5
+echo "$as_me:9623: result: $ac_cv_header_locale_h" >&5
 echo "${ECHO_T}$ac_cv_header_locale_h" >&6
 
 for ac_func in setlocale
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9582: checking for $ac_func" >&5
+echo "$as_me:9629: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9588 "configure"
+#line 9635 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9616,16 +9663,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9619: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9622: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9666: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9669: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9625: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9628: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9672: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9675: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9635,7 +9682,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9638: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9685: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9658,23 +9705,23 @@
 fi
 
 if test $ac_have_func = no; then
-  echo "$as_me:9661: checking for inq_stats/cpustats.h" >&5
+  echo "$as_me:9708: checking for inq_stats/cpustats.h" >&5
 echo $ECHO_N "checking for inq_stats/cpustats.h... $ECHO_C" >&6
 if test "${ac_cv_header_inq_stats_cpustats_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9667 "configure"
+#line 9714 "configure"
 #include "confdefs.h"
 #include <inq_stats/cpustats.h>
 _ACEOF
-if { (eval echo "$as_me:9671: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9718: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9677: \$? = $ac_status" >&5
+  echo "$as_me:9724: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9693,7 +9740,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9696: result: $ac_cv_header_inq_stats_cpustats_h" >&5
+echo "$as_me:9743: result: $ac_cv_header_inq_stats_cpustats_h" >&5
 echo "${ECHO_T}$ac_cv_header_inq_stats_cpustats_h" >&6
 if test $ac_cv_header_inq_stats_cpustats_h = yes; then
   ac_have_func=yes
@@ -9711,23 +9758,23 @@
 fi
 
 if test $ac_have_func = no; then
-  echo "$as_me:9714: checking for sys/cpustats.h" >&5
+  echo "$as_me:9761: checking for sys/cpustats.h" >&5
 echo $ECHO_N "checking for sys/cpustats.h... $ECHO_C" >&6
 if test "${ac_cv_header_sys_cpustats_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9720 "configure"
+#line 9767 "configure"
 #include "confdefs.h"
 #include <sys/cpustats.h>
 _ACEOF
-if { (eval echo "$as_me:9724: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9771: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9730: \$? = $ac_status" >&5
+  echo "$as_me:9777: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9746,7 +9793,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9749: result: $ac_cv_header_sys_cpustats_h" >&5
+echo "$as_me:9796: result: $ac_cv_header_sys_cpustats_h" >&5
 echo "${ECHO_T}$ac_cv_header_sys_cpustats_h" >&6
 if test $ac_cv_header_sys_cpustats_h = yes; then
   ac_have_func=yes; cat >>confdefs.h <<\EOF
@@ -9762,23 +9809,23 @@
 for ac_header in mach/mach.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9765: checking for $ac_header" >&5
+echo "$as_me:9812: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9771 "configure"
+#line 9818 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9775: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9822: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9781: \$? = $ac_status" >&5
+  echo "$as_me:9828: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9797,7 +9844,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9800: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9847: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9812,23 +9859,23 @@
 for ac_header in nlist.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9815: checking for $ac_header" >&5
+echo "$as_me:9862: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9821 "configure"
+#line 9868 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9825: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9872: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9831: \$? = $ac_status" >&5
+  echo "$as_me:9878: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9847,19 +9894,19 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9850: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9897: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
- echo "$as_me:9856: checking for struct nlist.n_un.n_name" >&5
+ echo "$as_me:9903: checking for struct nlist.n_un.n_name" >&5
 echo $ECHO_N "checking for struct nlist.n_un.n_name... $ECHO_C" >&6
 if test "${ac_cv_member_struct_nlist_n_un_n_name+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9862 "configure"
+#line 9909 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 
@@ -9874,16 +9921,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9877: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9924: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9880: \$? = $ac_status" >&5
+  echo "$as_me:9927: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9883: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9886: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9930: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9933: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_nlist_n_un_n_name=yes
 else
@@ -9893,7 +9940,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9896: result: $ac_cv_member_struct_nlist_n_un_n_name" >&5
+echo "$as_me:9943: result: $ac_cv_member_struct_nlist_n_un_n_name" >&5
 echo "${ECHO_T}$ac_cv_member_struct_nlist_n_un_n_name" >&6
 if test $ac_cv_member_struct_nlist_n_un_n_name = yes; then
 
@@ -9914,13 +9961,13 @@
 done
 
 # Some definitions of getloadavg require that the program be installed setgid.
-echo "$as_me:9917: checking whether getloadavg requires setgid" >&5
+echo "$as_me:9964: checking whether getloadavg requires setgid" >&5
 echo $ECHO_N "checking whether getloadavg requires setgid... $ECHO_C" >&6
 if test "${ac_cv_func_getloadavg_setgid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9923 "configure"
+#line 9970 "configure"
 #include "confdefs.h"
 #include "$srcdir/getloadavg.c"
 #ifdef LDAV_PRIVILEGED
@@ -9936,7 +9983,7 @@
 rm -f conftest*
 
 fi
-echo "$as_me:9939: result: $ac_cv_func_getloadavg_setgid" >&5
+echo "$as_me:9986: result: $ac_cv_func_getloadavg_setgid" >&5
 echo "${ECHO_T}$ac_cv_func_getloadavg_setgid" >&6
 if test $ac_cv_func_getloadavg_setgid = yes; then
   NEED_SETGID=true
@@ -9950,7 +9997,7 @@
 fi
 
 if test $ac_cv_func_getloadavg_setgid = yes; then
-  echo "$as_me:9953: checking group of /dev/kmem" >&5
+  echo "$as_me:10000: checking group of /dev/kmem" >&5
 echo $ECHO_N "checking group of /dev/kmem... $ECHO_C" >&6
 if test "${ac_cv_group_kmem+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9965,7 +10012,7 @@
 	       / /s/.* //;p;'`
 
 fi
-echo "$as_me:9968: result: $ac_cv_group_kmem" >&5
+echo "$as_me:10015: result: $ac_cv_group_kmem" >&5
 echo "${ECHO_T}$ac_cv_group_kmem" >&6
   KMEM_GROUP=$ac_cv_group_kmem
 fi
@@ -9976,7 +10023,7 @@
 fi
 LIBS=$ac_save_LIBS
 
-echo "$as_me:9979: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "$as_me:10026: checking for _LARGEFILE_SOURCE value needed for large files" >&5
 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9984,7 +10031,7 @@
   while :; do
   ac_cv_sys_largefile_source=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 9987 "configure"
+#line 10034 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9996,16 +10043,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9999: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10046: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10002: \$? = $ac_status" >&5
+  echo "$as_me:10049: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10005: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10008: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10052: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10055: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -10014,7 +10061,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 10017 "configure"
+#line 10064 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -10027,16 +10074,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10030: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10077: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10033: \$? = $ac_status" >&5
+  echo "$as_me:10080: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10036: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10039: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10083: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10086: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -10047,7 +10094,7 @@
   break
 done
 fi
-echo "$as_me:10050: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:10097: result: $ac_cv_sys_largefile_source" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
 if test "$ac_cv_sys_largefile_source" != no; then
 
@@ -10061,13 +10108,13 @@
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:10064: checking for fseeko" >&5
+echo "$as_me:10111: checking for fseeko" >&5
 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
 if test "${ac_cv_func_fseeko+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10070 "configure"
+#line 10117 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10079,16 +10126,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10082: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10085: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10129: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10132: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10088: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10091: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10135: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10138: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -10098,7 +10145,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10101: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:10148: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -10113,13 +10160,13 @@
 for ac_func in grantpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10116: checking for $ac_func" >&5
+echo "$as_me:10163: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10122 "configure"
+#line 10169 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10150,16 +10197,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10153: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10156: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10200: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10203: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10159: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10162: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10206: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10209: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10169,7 +10216,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10172: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10219: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10184,13 +10231,13 @@
 for ac_func in getpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10187: checking for $ac_func" >&5
+echo "$as_me:10234: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10193 "configure"
+#line 10240 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10221,16 +10268,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10224: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10227: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10271: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10274: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10230: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10233: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10277: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10280: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10240,7 +10287,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10243: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10290: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10255,7 +10302,7 @@
 # It's better to believe a function is not available
 # than to expect to find it in ncurses.
 
-echo "$as_me:10258: checking for tparm in -lncurses" >&5
+echo "$as_me:10305: checking for tparm in -lncurses" >&5
 echo $ECHO_N "checking for tparm in -lncurses... $ECHO_C" >&6
 if test "${ac_cv_lib_ncurses_tparm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10263,7 +10310,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10266 "configure"
+#line 10313 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10282,16 +10329,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10285: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10288: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10332: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10335: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10291: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10294: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10338: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10341: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ncurses_tparm=yes
 else
@@ -10302,7 +10349,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10305: result: $ac_cv_lib_ncurses_tparm" >&5
+echo "$as_me:10352: result: $ac_cv_lib_ncurses_tparm" >&5
 echo "${ECHO_T}$ac_cv_lib_ncurses_tparm" >&6
 if test $ac_cv_lib_ncurses_tparm = yes; then
   cat >>confdefs.h <<EOF
@@ -10317,13 +10364,13 @@
 if test "$with_hesiod" = yes ; then
   # Don't set $LIBS here -- see comments above.
   resolv=no
-  echo "$as_me:10320: checking for res_send" >&5
+  echo "$as_me:10367: checking for res_send" >&5
 echo $ECHO_N "checking for res_send... $ECHO_C" >&6
 if test "${ac_cv_func_res_send+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10326 "configure"
+#line 10373 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char res_send (); below.  */
@@ -10354,16 +10401,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10357: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10360: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10404: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10407: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10363: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10366: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10410: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10413: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_res_send=yes
 else
@@ -10373,18 +10420,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10376: result: $ac_cv_func_res_send" >&5
+echo "$as_me:10423: result: $ac_cv_func_res_send" >&5
 echo "${ECHO_T}$ac_cv_func_res_send" >&6
 if test $ac_cv_func_res_send = yes; then
   :
 else
-  echo "$as_me:10381: checking for __res_send" >&5
+  echo "$as_me:10428: checking for __res_send" >&5
 echo $ECHO_N "checking for __res_send... $ECHO_C" >&6
 if test "${ac_cv_func___res_send+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10387 "configure"
+#line 10434 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char __res_send (); below.  */
@@ -10415,16 +10462,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10418: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10421: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10465: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10468: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10424: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10427: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10471: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10474: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func___res_send=yes
 else
@@ -10434,12 +10481,12 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10437: result: $ac_cv_func___res_send" >&5
+echo "$as_me:10484: result: $ac_cv_func___res_send" >&5
 echo "${ECHO_T}$ac_cv_func___res_send" >&6
 if test $ac_cv_func___res_send = yes; then
   :
 else
-  echo "$as_me:10442: checking for res_send in -lresolv" >&5
+  echo "$as_me:10489: checking for res_send in -lresolv" >&5
 echo $ECHO_N "checking for res_send in -lresolv... $ECHO_C" >&6
 if test "${ac_cv_lib_resolv_res_send+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10447,7 +10494,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10450 "configure"
+#line 10497 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10466,16 +10513,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10469: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10472: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10516: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10519: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10475: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10478: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10522: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10525: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv_res_send=yes
 else
@@ -10486,12 +10533,12 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10489: result: $ac_cv_lib_resolv_res_send" >&5
+echo "$as_me:10536: result: $ac_cv_lib_resolv_res_send" >&5
 echo "${ECHO_T}$ac_cv_lib_resolv_res_send" >&6
 if test $ac_cv_lib_resolv_res_send = yes; then
   resolv=yes
 else
-  echo "$as_me:10494: checking for __res_send in -lresolv" >&5
+  echo "$as_me:10541: checking for __res_send in -lresolv" >&5
 echo $ECHO_N "checking for __res_send in -lresolv... $ECHO_C" >&6
 if test "${ac_cv_lib_resolv___res_send+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10499,7 +10546,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10502 "configure"
+#line 10549 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10518,16 +10565,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10521: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10524: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10568: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10571: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10527: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10530: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10574: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10577: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv___res_send=yes
 else
@@ -10538,7 +10585,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10541: result: $ac_cv_lib_resolv___res_send" >&5
+echo "$as_me:10588: result: $ac_cv_lib_resolv___res_send" >&5
 echo "${ECHO_T}$ac_cv_lib_resolv___res_send" >&6
 if test $ac_cv_lib_resolv___res_send = yes; then
   resolv=yes
@@ -10560,13 +10607,13 @@
   else
     RESOLVLIB=
   fi
-  echo "$as_me:10563: checking for hes_getmailhost" >&5
+  echo "$as_me:10610: checking for hes_getmailhost" >&5
 echo $ECHO_N "checking for hes_getmailhost... $ECHO_C" >&6
 if test "${ac_cv_func_hes_getmailhost+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10569 "configure"
+#line 10616 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char hes_getmailhost (); below.  */
@@ -10597,16 +10644,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10600: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10603: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10647: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10650: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10606: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10609: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10653: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10656: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_hes_getmailhost=yes
 else
@@ -10616,12 +10663,12 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10619: result: $ac_cv_func_hes_getmailhost" >&5
+echo "$as_me:10666: result: $ac_cv_func_hes_getmailhost" >&5
 echo "${ECHO_T}$ac_cv_func_hes_getmailhost" >&6
 if test $ac_cv_func_hes_getmailhost = yes; then
   :
 else
-  echo "$as_me:10624: checking for hes_getmailhost in -lhesiod" >&5
+  echo "$as_me:10671: checking for hes_getmailhost in -lhesiod" >&5
 echo $ECHO_N "checking for hes_getmailhost in -lhesiod... $ECHO_C" >&6
 if test "${ac_cv_lib_hesiod_hes_getmailhost+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10629,7 +10676,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhesiod $RESOLVLIB $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10632 "configure"
+#line 10679 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10648,16 +10695,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10651: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10654: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10698: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10701: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10657: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10660: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10704: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10707: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_hesiod_hes_getmailhost=yes
 else
@@ -10668,7 +10715,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10671: result: $ac_cv_lib_hesiod_hes_getmailhost" >&5
+echo "$as_me:10718: result: $ac_cv_lib_hesiod_hes_getmailhost" >&5
 echo "${ECHO_T}$ac_cv_lib_hesiod_hes_getmailhost" >&6
 if test $ac_cv_lib_hesiod_hes_getmailhost = yes; then
 
@@ -10687,7 +10734,7 @@
 # These tell us which Kerberos-related libraries to use.
 if test "${with_kerberos+set}" = set; then
 
-echo "$as_me:10690: checking for com_err in -lcom_err" >&5
+echo "$as_me:10737: checking for com_err in -lcom_err" >&5
 echo $ECHO_N "checking for com_err in -lcom_err... $ECHO_C" >&6
 if test "${ac_cv_lib_com_err_com_err+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10695,7 +10742,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcom_err  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10698 "configure"
+#line 10745 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10714,16 +10761,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10717: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10720: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10764: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10767: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10723: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10726: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10770: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10773: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_com_err_com_err=yes
 else
@@ -10734,7 +10781,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10737: result: $ac_cv_lib_com_err_com_err" >&5
+echo "$as_me:10784: result: $ac_cv_lib_com_err_com_err" >&5
 echo "${ECHO_T}$ac_cv_lib_com_err_com_err" >&6
 if test $ac_cv_lib_com_err_com_err = yes; then
   cat >>confdefs.h <<EOF
@@ -10745,7 +10792,7 @@
 
 fi
 
-echo "$as_me:10748: checking for mit_des_cbc_encrypt in -lk5crypto" >&5
+echo "$as_me:10795: checking for mit_des_cbc_encrypt in -lk5crypto" >&5
 echo $ECHO_N "checking for mit_des_cbc_encrypt in -lk5crypto... $ECHO_C" >&6
 if test "${ac_cv_lib_k5crypto_mit_des_cbc_encrypt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10753,7 +10800,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lk5crypto  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10756 "configure"
+#line 10803 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10772,16 +10819,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10775: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10778: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10822: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10825: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10781: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10784: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10828: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10831: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_k5crypto_mit_des_cbc_encrypt=yes
 else
@@ -10792,7 +10839,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10795: result: $ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&5
+echo "$as_me:10842: result: $ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&5
 echo "${ECHO_T}$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&6
 if test $ac_cv_lib_k5crypto_mit_des_cbc_encrypt = yes; then
   cat >>confdefs.h <<EOF
@@ -10803,7 +10850,7 @@
 
 fi
 
-echo "$as_me:10806: checking for mit_des_cbc_encrypt in -lcrypto" >&5
+echo "$as_me:10853: checking for mit_des_cbc_encrypt in -lcrypto" >&5
 echo $ECHO_N "checking for mit_des_cbc_encrypt in -lcrypto... $ECHO_C" >&6
 if test "${ac_cv_lib_crypto_mit_des_cbc_encrypt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10811,7 +10858,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10814 "configure"
+#line 10861 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10830,16 +10877,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10833: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10836: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10880: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10883: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10839: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10842: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10886: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10889: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_crypto_mit_des_cbc_encrypt=yes
 else
@@ -10850,7 +10897,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10853: result: $ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5
+echo "$as_me:10900: result: $ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5
 echo "${ECHO_T}$ac_cv_lib_crypto_mit_des_cbc_encrypt" >&6
 if test $ac_cv_lib_crypto_mit_des_cbc_encrypt = yes; then
   cat >>confdefs.h <<EOF
@@ -10861,7 +10908,7 @@
 
 fi
 
-echo "$as_me:10864: checking for krb5_init_context in -lkrb5" >&5
+echo "$as_me:10911: checking for krb5_init_context in -lkrb5" >&5
 echo $ECHO_N "checking for krb5_init_context in -lkrb5... $ECHO_C" >&6
 if test "${ac_cv_lib_krb5_krb5_init_context+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10869,7 +10916,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkrb5  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10872 "configure"
+#line 10919 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10888,16 +10935,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10891: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10894: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10938: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10941: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10897: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10900: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10944: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10947: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_krb5_krb5_init_context=yes
 else
@@ -10908,7 +10955,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10911: result: $ac_cv_lib_krb5_krb5_init_context" >&5
+echo "$as_me:10958: result: $ac_cv_lib_krb5_krb5_init_context" >&5
 echo "${ECHO_T}$ac_cv_lib_krb5_krb5_init_context" >&6
 if test $ac_cv_lib_krb5_krb5_init_context = yes; then
   cat >>confdefs.h <<EOF
@@ -10921,7 +10968,7 @@
 
   if test "${with_kerberos5+set}" != set; then
 
-echo "$as_me:10924: checking for des_cbc_encrypt in -ldes425" >&5
+echo "$as_me:10971: checking for des_cbc_encrypt in -ldes425" >&5
 echo $ECHO_N "checking for des_cbc_encrypt in -ldes425... $ECHO_C" >&6
 if test "${ac_cv_lib_des425_des_cbc_encrypt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10929,7 +10976,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldes425  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10932 "configure"
+#line 10979 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10948,16 +10995,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10951: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10954: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10998: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11001: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10957: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10960: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11004: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11007: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_des425_des_cbc_encrypt=yes
 else
@@ -10968,7 +11015,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10971: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5
+echo "$as_me:11018: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5
 echo "${ECHO_T}$ac_cv_lib_des425_des_cbc_encrypt" >&6
 if test $ac_cv_lib_des425_des_cbc_encrypt = yes; then
   cat >>confdefs.h <<EOF
@@ -10979,7 +11026,7 @@
 
 else
 
-echo "$as_me:10982: checking for des_cbc_encrypt in -ldes" >&5
+echo "$as_me:11029: checking for des_cbc_encrypt in -ldes" >&5
 echo $ECHO_N "checking for des_cbc_encrypt in -ldes... $ECHO_C" >&6
 if test "${ac_cv_lib_des_des_cbc_encrypt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10987,7 +11034,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldes  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10990 "configure"
+#line 11037 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11006,16 +11053,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11009: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11012: \$? = $ac_status" >&5
+if { (eval echo "$as_me:11056: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11059: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11015: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11018: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11062: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11065: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_des_des_cbc_encrypt=yes
 else
@@ -11026,7 +11073,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11029: result: $ac_cv_lib_des_des_cbc_encrypt" >&5
+echo "$as_me:11076: result: $ac_cv_lib_des_des_cbc_encrypt" >&5
 echo "${ECHO_T}$ac_cv_lib_des_des_cbc_encrypt" >&6
 if test $ac_cv_lib_des_des_cbc_encrypt = yes; then
   cat >>confdefs.h <<EOF
@@ -11039,7 +11086,7 @@
 
 fi
 
-echo "$as_me:11042: checking for krb_get_cred in -lkrb4" >&5
+echo "$as_me:11089: checking for krb_get_cred in -lkrb4" >&5
 echo $ECHO_N "checking for krb_get_cred in -lkrb4... $ECHO_C" >&6
 if test "${ac_cv_lib_krb4_krb_get_cred+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11047,7 +11094,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkrb4  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11050 "configure"
+#line 11097 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11066,16 +11113,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11069: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11072: \$? = $ac_status" >&5
+if { (eval echo "$as_me:11116: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11119: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11075: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11078: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11122: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11125: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_krb4_krb_get_cred=yes
 else
@@ -11086,7 +11133,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11089: result: $ac_cv_lib_krb4_krb_get_cred" >&5
+echo "$as_me:11136: result: $ac_cv_lib_krb4_krb_get_cred" >&5
 echo "${ECHO_T}$ac_cv_lib_krb4_krb_get_cred" >&6
 if test $ac_cv_lib_krb4_krb_get_cred = yes; then
   cat >>confdefs.h <<EOF
@@ -11097,7 +11144,7 @@
 
 else
 
-echo "$as_me:11100: checking for krb_get_cred in -lkrb" >&5
+echo "$as_me:11147: checking for krb_get_cred in -lkrb" >&5
 echo $ECHO_N "checking for krb_get_cred in -lkrb... $ECHO_C" >&6
 if test "${ac_cv_lib_krb_krb_get_cred+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11105,7 +11152,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkrb  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11108 "configure"
+#line 11155 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11124,16 +11171,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11127: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11130: \$? = $ac_status" >&5
+if { (eval echo "$as_me:11174: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11177: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11133: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11136: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11180: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11183: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_krb_krb_get_cred=yes
 else
@@ -11144,7 +11191,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11147: result: $ac_cv_lib_krb_krb_get_cred" >&5
+echo "$as_me:11194: result: $ac_cv_lib_krb_krb_get_cred" >&5
 echo "${ECHO_T}$ac_cv_lib_krb_krb_get_cred" >&6
 if test $ac_cv_lib_krb_krb_get_cred = yes; then
   cat >>confdefs.h <<EOF
@@ -11164,23 +11211,23 @@
 for ac_header in krb5.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11167: checking for $ac_header" >&5
+echo "$as_me:11214: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11173 "configure"
+#line 11220 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11177: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11224: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:11183: \$? = $ac_status" >&5
+  echo "$as_me:11230: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11199,7 +11246,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11202: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11249: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -11214,53 +11261,6 @@
 for ac_header in des.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11217: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 11223 "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:11227: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:11233: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_ext
-fi
-echo "$as_me:11252: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-EOF
-
-else
-
-for ac_header in kerberosIV/des.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 echo "$as_me:11264: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -11305,7 +11305,7 @@
 
 else
 
-for ac_header in kerberos/des.h
+for ac_header in kerberosIV/des.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 echo "$as_me:11311: checking for $ac_header" >&5
@@ -11350,35 +11350,28 @@
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
 
-fi
-done
-
-fi
-done
-
-fi
-done
-
-for ac_header in krb.h
+else
+
+for ac_header in kerberos/des.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11365: checking for $ac_header" >&5
+echo "$as_me:11358: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11371 "configure"
+#line 11364 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11375: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11368: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:11381: \$? = $ac_status" >&5
+  echo "$as_me:11374: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11397,16 +11390,23 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11400: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11393: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
 
-else
-
-for ac_header in kerberosIV/krb.h
+fi
+done
+
+fi
+done
+
+fi
+done
+
+for ac_header in krb.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 echo "$as_me:11412: checking for $ac_header" >&5
@@ -11453,7 +11453,7 @@
 
 else
 
-for ac_header in kerberos/krb.h
+for ac_header in kerberosIV/krb.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 echo "$as_me:11459: checking for $ac_header" >&5
@@ -11498,37 +11498,28 @@
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
 
-fi
-done
-
-fi
-done
-
-fi
-done
-
-  fi
-
-for ac_header in com_err.h
+else
+
+for ac_header in kerberos/krb.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11515: checking for $ac_header" >&5
+echo "$as_me:11506: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11521 "configure"
+#line 11512 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11525: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11516: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:11531: \$? = $ac_status" >&5
+  echo "$as_me:11522: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11547,7 +11538,63 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11550: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11541: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+fi
+done
+
+fi
+done
+
+  fi
+
+for ac_header in com_err.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:11562: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 11568 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:11572: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  egrep -v '^ *\+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:11578: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_ext
+fi
+echo "$as_me:11597: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -11562,7 +11609,7 @@
 # Solaris requires -lintl if you want strerror (which calls dgettext)
 # to return localized messages.
 
-echo "$as_me:11565: checking for dgettext in -lintl" >&5
+echo "$as_me:11612: checking for dgettext in -lintl" >&5
 echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_dgettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11570,7 +11617,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11573 "configure"
+#line 11620 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11589,16 +11636,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11592: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11595: \$? = $ac_status" >&5
+if { (eval echo "$as_me:11639: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11642: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11598: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11601: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11645: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11648: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_intl_dgettext=yes
 else
@@ -11609,7 +11656,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11612: result: $ac_cv_lib_intl_dgettext" >&5
+echo "$as_me:11659: result: $ac_cv_lib_intl_dgettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6
 if test $ac_cv_lib_intl_dgettext = yes; then
   cat >>confdefs.h <<EOF
@@ -11620,7 +11667,7 @@
 
 fi
 
-echo "$as_me:11623: checking whether localtime caches TZ" >&5
+echo "$as_me:11670: checking whether localtime caches TZ" >&5
 echo $ECHO_N "checking whether localtime caches TZ... $ECHO_C" >&6
 if test "${emacs_cv_localtime_cache+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11631,7 +11678,7 @@
 emacs_cv_localtime_cache=yes
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11634 "configure"
+#line 11681 "configure"
 #include "confdefs.h"
 #include <time.h>
 extern char **environ;
@@ -11664,15 +11711,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11667: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11670: \$? = $ac_status" >&5
+if { (eval echo "$as_me:11714: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11717: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11672: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11675: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11719: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11722: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_localtime_cache=no
 else
@@ -11689,7 +11736,7 @@
 	emacs_cv_localtime_cache=no
 fi
 fi
-echo "$as_me:11692: result: $emacs_cv_localtime_cache" >&5
+echo "$as_me:11739: result: $emacs_cv_localtime_cache" >&5
 echo "${ECHO_T}$emacs_cv_localtime_cache" >&6
 if test $emacs_cv_localtime_cache = yes; then
 
@@ -11704,13 +11751,13 @@
 for ac_func in gettimeofday
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11707: checking for $ac_func" >&5
+echo "$as_me:11754: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11713 "configure"
+#line 11760 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11741,16 +11788,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11744: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11747: \$? = $ac_status" >&5
+if { (eval echo "$as_me:11791: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11794: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11750: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11753: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11797: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11800: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11760,7 +11807,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11763: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11810: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -11771,13 +11818,13 @@
 done
 
   if test $ac_cv_func_gettimeofday = yes; then
-    echo "$as_me:11774: checking whether gettimeofday can accept two arguments" >&5
+    echo "$as_me:11821: checking whether gettimeofday can accept two arguments" >&5
 echo $ECHO_N "checking whether gettimeofday can accept two arguments... $ECHO_C" >&6
 if test "${emacs_cv_gettimeofday_two_arguments+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11780 "configure"
+#line 11827 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -11800,16 +11847,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11803: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11850: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11806: \$? = $ac_status" >&5
+  echo "$as_me:11853: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11809: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11812: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11856: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11859: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_gettimeofday_two_arguments=yes
 else
@@ -11819,7 +11866,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11822: result: $emacs_cv_gettimeofday_two_arguments" >&5
+echo "$as_me:11869: result: $emacs_cv_gettimeofday_two_arguments" >&5
 echo "${ECHO_T}$emacs_cv_gettimeofday_two_arguments" >&6
     if test $emacs_cv_gettimeofday_two_arguments = no; then
 
@@ -11832,13 +11879,13 @@
 fi
 
 if test "$ac_cv_func_gettimeofday" = yes; then
-  echo "$as_me:11835: checking for struct timezone" >&5
+  echo "$as_me:11882: checking for struct timezone" >&5
 echo $ECHO_N "checking for struct timezone... $ECHO_C" >&6
 if test "${emacs_cv_struct_timezone+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11841 "configure"
+#line 11888 "configure"
 #include "confdefs.h"
 #include <sys/time.h>
 int
@@ -11850,22 +11897,22 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11853: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11900: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11856: \$? = $ac_status" >&5
+  echo "$as_me:11903: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11859: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11862: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11906: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11909: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
               if test "$cross_compiling" = yes; then
   emacs_cv_struct_timezone=yes
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11868 "configure"
+#line 11915 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -11885,15 +11932,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11888: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11891: \$? = $ac_status" >&5
+if { (eval echo "$as_me:11935: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11938: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11893: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11896: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11940: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11943: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_struct_timezone=yes
 else
@@ -11911,18 +11958,18 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11914: result: $emacs_cv_struct_timezone" >&5
+echo "$as_me:11961: result: $emacs_cv_struct_timezone" >&5
 echo "${ECHO_T}$emacs_cv_struct_timezone" >&6
 fi
 
 ok_so_far=yes
-echo "$as_me:11919: checking for socket" >&5
+echo "$as_me:11966: checking for socket" >&5
 echo $ECHO_N "checking for socket... $ECHO_C" >&6
 if test "${ac_cv_func_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11925 "configure"
+#line 11972 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket (); below.  */
@@ -11953,16 +12000,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11956: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11959: \$? = $ac_status" >&5
+if { (eval echo "$as_me:12003: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12006: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11962: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11965: \$? = $ac_status" >&5
+  { (eval echo "$as_me:12009: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12012: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_socket=yes
 else
@@ -11972,7 +12019,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11975: result: $ac_cv_func_socket" >&5
+echo "$as_me:12022: result: $ac_cv_func_socket" >&5
 echo "${ECHO_T}$ac_cv_func_socket" >&6
 if test $ac_cv_func_socket = yes; then
   :
@@ -11981,23 +12028,23 @@
 fi
 
 if test $ok_so_far = yes; then
-  echo "$as_me:11984: checking for netinet/in.h" >&5
+  echo "$as_me:12031: checking for netinet/in.h" >&5
 echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6
 if test "${ac_cv_header_netinet_in_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11990 "configure"
+#line 12037 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 _ACEOF
-if { (eval echo "$as_me:11994: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12041: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12000: \$? = $ac_status" >&5
+  echo "$as_me:12047: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12016,7 +12063,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12019: result: $ac_cv_header_netinet_in_h" >&5
+echo "$as_me:12066: result: $ac_cv_header_netinet_in_h" >&5
 echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6
 if test $ac_cv_header_netinet_in_h = yes; then
   :
@@ -12026,23 +12073,23 @@
 
 fi
 if test $ok_so_far = yes; then
-  echo "$as_me:12029: checking for arpa/inet.h" >&5
+  echo "$as_me:12076: checking for arpa/inet.h" >&5
 echo $ECHO_N "checking for arpa/inet.h... $ECHO_C" >&6
 if test "${ac_cv_header_arpa_inet_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12035 "configure"
+#line 12082 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 _ACEOF
-if { (eval echo "$as_me:12039: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12086: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12045: \$? = $ac_status" >&5
+  echo "$as_me:12092: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12061,7 +12108,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12064: result: $ac_cv_header_arpa_inet_h" >&5
+echo "$as_me:12111: result: $ac_cv_header_arpa_inet_h" >&5
 echo "${ECHO_T}$ac_cv_header_arpa_inet_h" >&6
 if test $ac_cv_header_arpa_inet_h = yes; then
   :
@@ -12086,10 +12133,10 @@
 
 fi
 
-echo "$as_me:12089: checking whether system supports dynamic ptys" >&5
+echo "$as_me:12136: checking whether system supports dynamic ptys" >&5
 echo $ECHO_N "checking whether system supports dynamic ptys... $ECHO_C" >&6
 if test -d /dev/pts && ls -d /dev/ptmx > /dev/null 2>&1 ; then
-  echo "$as_me:12092: result: yes" >&5
+  echo "$as_me:12139: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -12097,17 +12144,17 @@
 EOF
 
 else
-  echo "$as_me:12100: result: no" >&5
+  echo "$as_me:12147: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12104: checking for pid_t" >&5
+echo "$as_me:12151: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12110 "configure"
+#line 12157 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -12122,16 +12169,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12125: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12172: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12128: \$? = $ac_status" >&5
+  echo "$as_me:12175: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12131: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12134: \$? = $ac_status" >&5
+  { (eval echo "$as_me:12178: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12181: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -12141,7 +12188,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12144: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:12191: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
   :
@@ -12156,23 +12203,23 @@
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12159: checking for $ac_header" >&5
+echo "$as_me:12206: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12165 "configure"
+#line 12212 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12169: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12216: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12175: \$? = $ac_status" >&5
+  echo "$as_me:12222: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12191,7 +12238,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12194: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12241: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -12204,13 +12251,13 @@
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12207: checking for $ac_func" >&5
+echo "$as_me:12254: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12213 "configure"
+#line 12260 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12241,16 +12288,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12244: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:12247: \$? = $ac_status" >&5
+if { (eval echo "$as_me:12291: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12294: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12250: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12253: \$? = $ac_status" >&5
+  { (eval echo "$as_me:12297: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12300: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12260,7 +12307,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12263: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12310: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -12272,7 +12319,7 @@
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:12275: checking for working fork" >&5
+  echo "$as_me:12322: checking for working fork" >&5
 echo $ECHO_N "checking for working fork... $ECHO_C" >&6
 if test "${ac_cv_func_fork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12295,15 +12342,15 @@
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12298: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:12301: \$? = $ac_status" >&5
+if { (eval echo "$as_me:12345: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12348: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12303: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12306: \$? = $ac_status" >&5
+  { (eval echo "$as_me:12350: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12353: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -12315,7 +12362,7 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:12318: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:12365: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -12329,12 +12376,12 @@
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:12332: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:12379: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
 fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 if test "x$ac_cv_func_vfork" = xyes; then
-  echo "$as_me:12337: checking for working vfork" >&5
+  echo "$as_me:12384: checking for working vfork" >&5
 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
 if test "${ac_cv_func_vfork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12343,7 +12390,7 @@
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12346 "configure"
+#line 12393 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -12440,15 +12487,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12443: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:12446: \$? = $ac_status" >&5
+if { (eval echo "$as_me:12490: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12493: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12448: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12451: \$? = $ac_status" >&5
+  { (eval echo "$as_me:12495: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12498: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -12460,13 +12507,13 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:12463: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:12510: result: $ac_cv_func_vfork_works" >&5
 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
 
 fi;
 if test "x$ac_cv_func_fork_works" = xcross; then
   ac_cv_func_vfork_works=ac_cv_func_vfork
-  { echo "$as_me:12469: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:12516: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
 fi
 
@@ -12492,13 +12539,13 @@
 fi
 
 # Fixme: This should be replaced when we have autoconf 2.14.
-echo "$as_me:12495: checking for size_t" >&5
+echo "$as_me:12542: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12501 "configure"
+#line 12548 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -12513,16 +12560,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12516: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12563: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12519: \$? = $ac_status" >&5
+  echo "$as_me:12566: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12522: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12525: \$? = $ac_status" >&5
+  { (eval echo "$as_me:12569: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12572: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -12532,7 +12579,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12535: result: $ac_cv_type_size_t" >&5
+echo "$as_me:12582: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
@@ -12552,7 +12599,7 @@
 version=`grep 'defconst[	 ]*emacs-version' ${srcdir}/lisp/version.el \
 	 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
 if test x"${version}" = x; then
-  { { echo "$as_me:12555: error: can't find current emacs version in \`${srcdir}/lisp/version.el'." >&5
+  { { echo "$as_me:12602: error: can't find current emacs version in \`${srcdir}/lisp/version.el'." >&5
 echo "$as_me: error: can't find current emacs version in \`${srcdir}/lisp/version.el'." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12645,23 +12692,23 @@
 for ac_header in nlist.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12648: checking for $ac_header" >&5
+echo "$as_me:12695: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12654 "configure"
+#line 12701 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12658: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12705: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12664: \$? = $ac_status" >&5
+  echo "$as_me:12711: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12680,7 +12727,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12683: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12730: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -12706,8 +12753,7 @@
   Should Emacs use a relocating allocator for buffers?    ${REL_ALLOC}
   Should Emacs use mmap(2) for buffer allocation?         $use_mmap_for_buffers
   What window system should Emacs use?                    ${window_system}
-  What toolkit should Emacs use?                          ${USE_X_TOOLKIT}
-  Should Emacs use a shared game state directory?         ${gamedir}"
+  What toolkit should Emacs use?                          ${USE_X_TOOLKIT}"
 
 if test -n "${x_includes}"; then
 echo "  Where do we find X Windows header files?                ${x_includes}"
@@ -12741,7 +12787,7 @@
 ## C preprocessor.
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 12744 "configure"
+#line 12790 "configure"
 #include "confdefs.h"
 yes..yes
 _ACEOF
@@ -12834,7 +12880,7 @@
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:12837: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:12883: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -13010,7 +13056,7 @@
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:13013: error: ambiguous option: $1
+    { { echo "$as_me:13059: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -13029,7 +13075,7 @@
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:13032: error: unrecognized option: $1
+  -*) { { echo "$as_me:13078: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -13085,7 +13131,7 @@
   "leim/Makefile" ) CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:src/config.in" ;;
-  *) { { echo "$as_me:13088: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:13134: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -13334,7 +13380,7 @@
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:13337: creating $ac_file" >&5
+    { echo "$as_me:13383: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -13352,7 +13398,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:13355: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:13401: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -13365,7 +13411,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:13368: error: cannot find input file: $f" >&5
+           { { echo "$as_me:13414: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -13426,7 +13472,7 @@
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:13429: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:13475: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -13437,7 +13483,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:13440: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:13486: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -13450,7 +13496,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:13453: error: cannot find input file: $f" >&5
+           { { echo "$as_me:13499: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -13567,7 +13613,7 @@
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:13570: $ac_file is unchanged" >&5
+      { echo "$as_me:13616: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \