X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/1096bcc057c72162ca14d6cc117c7dc6398fb0be..a4e9932ab324d1d05c0758ff16b0f9b0011814d6:/configure

diff --git a/configure b/configure
index 2a097dde99..f52badd689 100755
--- a/configure
+++ b/configure
@@ -1657,6 +1657,10 @@ case "${canonical}" in
     machine=hp800 opsys=hpux11
   ;;
 
+  hppa*-*-linux-gnu* )
+    machine=hp800 opsys=gnu-linux
+  ;;
+
   ## HP 9000 series 700 and 800, running HP/UX
   hppa*-hp-hpux* )
     ## Cross-compilation?  Nah!
@@ -2218,7 +2222,7 @@ if test x"${opsys}" = x; then
 fi
 
 if test $unported = yes; then
-  { { echo "$as_me:2221: error: Emacs hasn't been ported to \`${canonical}' systems.
+  { { echo "$as_me:2225: 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;}
@@ -2247,7 +2251,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 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:2250: checking for $ac_word" >&5
+echo "$as_me:2254: 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
@@ -2262,7 +2266,7 @@ for ac_dir in $ac_dummy; do
   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:2265: found $ac_dir/$ac_word" >&5
+echo "$as_me:2269: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2270,10 +2274,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:2273: result: $CC" >&5
+  echo "$as_me:2277: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:2276: result: no" >&5
+  echo "$as_me:2280: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2282,7 +2286,7 @@ if test -z "$ac_cv_prog_CC"; then
   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:2285: checking for $ac_word" >&5
+echo "$as_me:2289: 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
@@ -2297,7 +2301,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:2300: found $ac_dir/$ac_word" >&5
+echo "$as_me:2304: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2305,10 +2309,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:2308: result: $ac_ct_CC" >&5
+  echo "$as_me:2312: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:2311: result: no" >&5
+  echo "$as_me:2315: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2321,7 +2325,7 @@ if test -z "$CC"; then
   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:2324: checking for $ac_word" >&5
+echo "$as_me:2328: 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
@@ -2336,7 +2340,7 @@ for ac_dir in $ac_dummy; do
   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:2339: found $ac_dir/$ac_word" >&5
+echo "$as_me:2343: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2344,10 +2348,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:2347: result: $CC" >&5
+  echo "$as_me:2351: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:2350: result: no" >&5
+  echo "$as_me:2354: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2356,7 +2360,7 @@ if test -z "$ac_cv_prog_CC"; then
   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:2359: checking for $ac_word" >&5
+echo "$as_me:2363: 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
@@ -2371,7 +2375,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:2374: found $ac_dir/$ac_word" >&5
+echo "$as_me:2378: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2379,10 +2383,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:2382: result: $ac_ct_CC" >&5
+  echo "$as_me:2386: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:2385: result: no" >&5
+  echo "$as_me:2389: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2395,7 +2399,7 @@ fi
 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:2398: checking for $ac_word" >&5
+echo "$as_me:2402: 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
@@ -2415,7 +2419,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:2418: found $ac_dir/$ac_word" >&5
+echo "$as_me:2422: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2437,10 +2441,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:2440: result: $CC" >&5
+  echo "$as_me:2444: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:2443: result: no" >&5
+  echo "$as_me:2447: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2451,7 +2455,7 @@ if test -z "$CC"; then
   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:2454: checking for $ac_word" >&5
+echo "$as_me:2458: 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
@@ -2466,7 +2470,7 @@ for ac_dir in $ac_dummy; do
   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:2469: found $ac_dir/$ac_word" >&5
+echo "$as_me:2473: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2474,10 +2478,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:2477: result: $CC" >&5
+  echo "$as_me:2481: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:2480: result: no" >&5
+  echo "$as_me:2484: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2490,7 +2494,7 @@ if test -z "$CC"; then
 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:2493: checking for $ac_word" >&5
+echo "$as_me:2497: 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
@@ -2505,7 +2509,7 @@ for ac_dir in $ac_dummy; do
   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:2508: found $ac_dir/$ac_word" >&5
+echo "$as_me:2512: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2513,10 +2517,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:2516: result: $ac_ct_CC" >&5
+  echo "$as_me:2520: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:2519: result: no" >&5
+  echo "$as_me:2523: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2528,32 +2532,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:2531: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:2535: 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:2536:" \
+echo "$as_me:2540:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:2539: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2543: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2542: \$? = $ac_status" >&5
+  echo "$as_me:2546: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:2544: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2548: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2547: \$? = $ac_status" >&5
+  echo "$as_me:2551: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:2549: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2553: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2552: \$? = $ac_status" >&5
+  echo "$as_me:2556: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 2556 "configure"
+#line 2560 "configure"
 #include "confdefs.h"
 
 int
@@ -2569,13 +2573,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:2572: checking for C compiler default output" >&5
+echo "$as_me:2576: 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:2575: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:2579: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:2578: \$? = $ac_status" >&5
+  echo "$as_me:2582: \$? = $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
@@ -2598,34 +2602,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:2601: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:2605: 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:2607: result: $ac_file" >&5
+echo "$as_me:2611: 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:2612: checking whether the C compiler works" >&5
+echo "$as_me:2616: 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:2618: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2622: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2621: \$? = $ac_status" >&5
+  echo "$as_me:2625: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:2628: error: cannot run C compiled programs.
+	{ { echo "$as_me:2632: 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;}
@@ -2633,24 +2637,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:2636: result: yes" >&5
+echo "$as_me:2640: 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:2643: checking whether we are cross compiling" >&5
+echo "$as_me:2647: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:2645: result: $cross_compiling" >&5
+echo "$as_me:2649: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:2648: checking for executable suffix" >&5
+echo "$as_me:2652: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:2650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2654: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2653: \$? = $ac_status" >&5
+  echo "$as_me:2657: \$? = $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
@@ -2666,25 +2670,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:2669: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:2673: 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:2675: result: $ac_cv_exeext" >&5
+echo "$as_me:2679: 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:2681: checking for object suffix" >&5
+echo "$as_me:2685: 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 2687 "configure"
+#line 2691 "configure"
 #include "confdefs.h"
 
 int
@@ -2696,10 +2700,10 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:2699: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2703: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2702: \$? = $ac_status" >&5
+  echo "$as_me:2706: \$? = $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
@@ -2711,24 +2715,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:2714: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:2718: 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:2721: result: $ac_cv_objext" >&5
+echo "$as_me:2725: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:2725: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:2729: 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 2731 "configure"
+#line 2735 "configure"
 #include "confdefs.h"
 
 int
@@ -2743,16 +2747,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2746: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2750: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2749: \$? = $ac_status" >&5
+  echo "$as_me:2753: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2755: \$? = $ac_status" >&5
+  echo "$as_me:2759: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -2764,19 +2768,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:2767: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:2771: 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:2773: checking whether $CC accepts -g" >&5
+echo "$as_me:2777: 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 2779 "configure"
+#line 2783 "configure"
 #include "confdefs.h"
 
 int
@@ -2788,16 +2792,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2791: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2795: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2794: \$? = $ac_status" >&5
+  echo "$as_me:2798: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2797: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2800: \$? = $ac_status" >&5
+  echo "$as_me:2804: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -2807,7 +2811,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2810: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2814: 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
@@ -2834,16 +2838,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2841: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2840: \$? = $ac_status" >&5
+  echo "$as_me:2844: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2846: \$? = $ac_status" >&5
+  echo "$as_me:2850: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -2855,7 +2859,7 @@ if { (eval echo "$as_me:2837: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 2858 "configure"
+#line 2862 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2868,16 +2872,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2871: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2875: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2874: \$? = $ac_status" >&5
+  echo "$as_me:2878: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2880: \$? = $ac_status" >&5
+  echo "$as_me:2884: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -2887,7 +2891,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 2890 "configure"
+#line 2894 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2899,16 +2903,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2902: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2905: \$? = $ac_status" >&5
+  echo "$as_me:2909: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2911: \$? = $ac_status" >&5
+  echo "$as_me:2915: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -2981,14 +2985,14 @@ fi
 #### 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:2984: checking whether ln -s works" >&5
+echo "$as_me:2988: 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:2988: result: yes" >&5
+  echo "$as_me:2992: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2991: result: no, using $LN_S" >&5
+  echo "$as_me:2995: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
@@ -2997,7 +3001,7 @@ ac_cpp='$CPP $CPPFLAGS'
 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:3000: checking how to run the C preprocessor" >&5
+echo "$as_me:3004: 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
@@ -3018,18 +3022,18 @@ do
   # 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 3021 "configure"
+#line 3025 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:3026: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3030: \"$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:3032: \$? = $ac_status" >&5
+  echo "$as_me:3036: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3052,17 +3056,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3055 "configure"
+#line 3059 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:3059: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3063: \"$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:3065: \$? = $ac_status" >&5
+  echo "$as_me:3069: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3099,7 +3103,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:3102: result: $CPP" >&5
+echo "$as_me:3106: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -3109,18 +3113,18 @@ do
   # 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 3112 "configure"
+#line 3116 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:3117: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3121: \"$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:3123: \$? = $ac_status" >&5
+  echo "$as_me:3127: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3143,17 +3147,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3146 "configure"
+#line 3150 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:3150: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3154: \"$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:3156: \$? = $ac_status" >&5
+  echo "$as_me:3160: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3181,7 +3185,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:3184: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:3188: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3204,7 +3208,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # 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:3207: checking for a BSD compatible install" >&5
+echo "$as_me:3211: 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
@@ -3253,7 +3257,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3256: result: $INSTALL" >&5
+echo "$as_me:3260: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3268,7 +3272,7 @@ for ac_prog in 'bison -y' byacc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3271: checking for $ac_word" >&5
+echo "$as_me:3275: 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
@@ -3283,7 +3287,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_YACC="$ac_prog"
-echo "$as_me:3286: found $ac_dir/$ac_word" >&5
+echo "$as_me:3290: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3291,10 +3295,10 @@ fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  echo "$as_me:3294: result: $YACC" >&5
+  echo "$as_me:3298: result: $YACC" >&5
 echo "${ECHO_T}$YACC" >&6
 else
-  echo "$as_me:3297: result: no" >&5
+  echo "$as_me:3301: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3306,7 +3310,7 @@ if test "x$RANLIB" = x; then
   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:3309: checking for $ac_word" >&5
+echo "$as_me:3313: 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
@@ -3321,7 +3325,7 @@ for ac_dir in $ac_dummy; do
   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:3324: found $ac_dir/$ac_word" >&5
+echo "$as_me:3328: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3329,10 +3333,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3332: result: $RANLIB" >&5
+  echo "$as_me:3336: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3335: result: no" >&5
+  echo "$as_me:3339: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3341,7 +3345,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   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:3344: checking for $ac_word" >&5
+echo "$as_me:3348: 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
@@ -3356,7 +3360,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:3359: found $ac_dir/$ac_word" >&5
+echo "$as_me:3363: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3365,10 +3369,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3368: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:3372: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3371: result: no" >&5
+  echo "$as_me:3375: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3379,10 +3383,10 @@ fi
 
 fi
 
-echo "$as_me:3382: checking for AIX" >&5
+echo "$as_me:3386: checking for AIX" >&5
 echo $ECHO_N "checking for AIX... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 3385 "configure"
+#line 3389 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -3391,21 +3395,21 @@ cat >conftest.$ac_ext <<_ACEOF
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
-  echo "$as_me:3394: result: yes" >&5
+  echo "$as_me:3398: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 cat >>confdefs.h <<\EOF
 #define _ALL_SOURCE 1
 EOF
 
 else
-  echo "$as_me:3401: result: no" >&5
+  echo "$as_me:3405: 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:3408: checking the machine- and system-dependent files to find out
+{ echo "$as_me:3412: 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
@@ -3555,7 +3559,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:3558: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:3562: 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
@@ -3567,7 +3571,7 @@ else
      	 # 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 3570 "configure"
+#line 3574 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3587,16 +3591,16 @@ main ()
 }
 _ACEOF
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3590: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3594: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3593: \$? = $ac_status" >&5
+  echo "$as_me:3597: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3596: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3600: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3599: \$? = $ac_status" >&5
+  echo "$as_me:3603: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3606,16 +3610,16 @@ fi
 rm -f conftest.$ac_objext
      	 CC="$CC -n32"
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3609: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3613: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3612: \$? = $ac_status" >&5
+  echo "$as_me:3616: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3618: \$? = $ac_status" >&5
+  echo "$as_me:3622: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -3629,13 +3633,13 @@ rm -f conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:3632: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:3636: 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:3638: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:3642: 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
@@ -3643,7 +3647,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 3646 "configure"
+#line 3650 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3663,16 +3667,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3666: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3670: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3669: \$? = $ac_status" >&5
+  echo "$as_me:3673: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3675: \$? = $ac_status" >&5
+  echo "$as_me:3679: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3681,7 +3685,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 3684 "configure"
+#line 3688 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -3702,16 +3706,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3705: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3709: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3708: \$? = $ac_status" >&5
+  echo "$as_me:3712: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3714: \$? = $ac_status" >&5
+  echo "$as_me:3718: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -3722,7 +3726,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:3725: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:3729: 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
 
@@ -3732,7 +3736,7 @@ EOF
 
 fi
 rm -f conftest*
-  echo "$as_me:3735: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:3739: 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
@@ -3740,7 +3744,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 3743 "configure"
+#line 3747 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3760,16 +3764,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3763: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3767: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3766: \$? = $ac_status" >&5
+  echo "$as_me:3770: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3772: \$? = $ac_status" >&5
+  echo "$as_me:3776: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3778,7 +3782,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 3781 "configure"
+#line 3785 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -3799,16 +3803,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3802: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3806: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3805: \$? = $ac_status" >&5
+  echo "$as_me:3809: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3811: \$? = $ac_status" >&5
+  echo "$as_me:3815: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -3819,7 +3823,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:3822: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:3826: 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
 
@@ -3836,23 +3840,23 @@ fi
 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:3839: checking for $ac_header" >&5
+echo "$as_me:3843: 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 3845 "configure"
+#line 3849 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3849: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3853: \"$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:3855: \$? = $ac_status" >&5
+  echo "$as_me:3859: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3871,7 +3875,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3874: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:3878: 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
@@ -3882,7 +3886,7 @@ fi
 done
 
 # Emulation library used on NetBSD.
-echo "$as_me:3885: checking for _oss_ioctl in -lossaudio" >&5
+echo "$as_me:3889: 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
@@ -3890,7 +3894,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lossaudio  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3893 "configure"
+#line 3897 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3909,16 +3913,16 @@ _oss_ioctl ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3912: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3916: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3915: \$? = $ac_status" >&5
+  echo "$as_me:3919: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3921: \$? = $ac_status" >&5
+  echo "$as_me:3925: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ossaudio__oss_ioctl=yes
 else
@@ -3929,7 +3933,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3932: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
+echo "$as_me:3936: 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
@@ -3942,23 +3946,23 @@ for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
   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:3945: checking for $ac_header" >&5
+echo "$as_me:3949: 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 3951 "configure"
+#line 3955 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3955: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3959: \"$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:3961: \$? = $ac_status" >&5
+  echo "$as_me:3965: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3977,7 +3981,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3980: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:3984: 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
@@ -3987,13 +3991,13 @@ EOF
 fi
 done
 
-echo "$as_me:3990: checking for ANSI C header files" >&5
+echo "$as_me:3994: 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 3996 "configure"
+#line 4000 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4001,13 +4005,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:4004: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4008: \"$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:4010: \$? = $ac_status" >&5
+  echo "$as_me:4014: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4029,7 +4033,7 @@ rm -f conftest.err conftest.$ac_ext
 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 4032 "configure"
+#line 4036 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -4047,7 +4051,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 4050 "configure"
+#line 4054 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -4068,7 +4072,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4071 "configure"
+#line 4075 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -4094,15 +4098,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4097: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4101: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4100: \$? = $ac_status" >&5
+  echo "$as_me:4104: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4105: \$? = $ac_status" >&5
+  echo "$as_me:4109: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -4115,7 +4119,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:4118: result: $ac_cv_header_stdc" >&5
+echo "$as_me:4122: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -4125,13 +4129,13 @@ EOF
 
 fi
 
-echo "$as_me:4128: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:4132: 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 4134 "configure"
+#line 4138 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -4147,16 +4151,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4154: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4153: \$? = $ac_status" >&5
+  echo "$as_me:4157: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4160: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4159: \$? = $ac_status" >&5
+  echo "$as_me:4163: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -4166,7 +4170,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4169: result: $ac_cv_header_time" >&5
+echo "$as_me:4173: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -4176,13 +4180,13 @@ EOF
 
 fi
 
-echo "$as_me:4179: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "$as_me:4183: 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 4185 "configure"
+#line 4189 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4200,16 +4204,16 @@ char *msg = *(sys_siglist + 1);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4203: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4207: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4206: \$? = $ac_status" >&5
+  echo "$as_me:4210: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4212: \$? = $ac_status" >&5
+  echo "$as_me:4216: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_decl_sys_siglist=yes
 else
@@ -4219,7 +4223,7 @@ ac_cv_decl_sys_siglist=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4222: result: $ac_cv_decl_sys_siglist" >&5
+echo "$as_me:4226: 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
 
@@ -4229,13 +4233,13 @@ EOF
 
 fi
 
-echo "$as_me:4232: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "$as_me:4236: 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 4238 "configure"
+#line 4242 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -4257,16 +4261,16 @@ main ()
 }
 _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 echo "$as_me:4270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4269: \$? = $ac_status" >&5
+  echo "$as_me:4273: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_sys_wait_h=yes
 else
@@ -4276,7 +4280,7 @@ ac_cv_header_sys_wait_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4279: result: $ac_cv_header_sys_wait_h" >&5
+echo "$as_me:4283: 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
 
@@ -4286,13 +4290,13 @@ EOF
 
 fi
 
-echo "$as_me:4289: checking for struct utimbuf" >&5
+echo "$as_me:4293: 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 4295 "configure"
+#line 4299 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -4316,16 +4320,16 @@ static struct utimbuf x; x.actime = x.modtime;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4319: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4323: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4322: \$? = $ac_status" >&5
+  echo "$as_me:4326: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4329: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4328: \$? = $ac_status" >&5
+  echo "$as_me:4332: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_struct_utimbuf=yes
 else
@@ -4335,7 +4339,7 @@ emacs_cv_struct_utimbuf=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4338: result: $emacs_cv_struct_utimbuf" >&5
+echo "$as_me:4342: result: $emacs_cv_struct_utimbuf" >&5
 echo "${ECHO_T}$emacs_cv_struct_utimbuf" >&6
 if test $emacs_cv_struct_utimbuf = yes; then
   cat >>confdefs.h <<\EOF
@@ -4344,13 +4348,13 @@ EOF
 
 fi
 
-echo "$as_me:4347: checking return type of signal handlers" >&5
+echo "$as_me:4351: 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 4353 "configure"
+#line 4357 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4372,16 +4376,16 @@ int i;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4375: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4379: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4378: \$? = $ac_status" >&5
+  echo "$as_me:4382: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4384: \$? = $ac_status" >&5
+  echo "$as_me:4388: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else
@@ -4391,20 +4395,20 @@ ac_cv_type_signal=int
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4394: result: $ac_cv_type_signal" >&5
+echo "$as_me:4398: 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:4401: checking for speed_t" >&5
+echo "$as_me:4405: 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 4407 "configure"
+#line 4411 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -4416,16 +4420,16 @@ speed_t x = 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4419: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4423: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4422: \$? = $ac_status" >&5
+  echo "$as_me:4426: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4428: \$? = $ac_status" >&5
+  echo "$as_me:4432: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_speed_t=yes
 else
@@ -4435,7 +4439,7 @@ emacs_cv_speed_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4438: result: $emacs_cv_speed_t" >&5
+echo "$as_me:4442: result: $emacs_cv_speed_t" >&5
 echo "${ECHO_T}$emacs_cv_speed_t" >&6
 if test $emacs_cv_speed_t = yes; then
   cat >>confdefs.h <<\EOF
@@ -4444,13 +4448,13 @@ EOF
 
 fi
 
-echo "$as_me:4447: checking for struct timeval" >&5
+echo "$as_me:4451: 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 4453 "configure"
+#line 4457 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -4471,16 +4475,16 @@ static struct timeval x; x.tv_sec = x.tv_usec;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4474: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4478: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4477: \$? = $ac_status" >&5
+  echo "$as_me:4481: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4484: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4483: \$? = $ac_status" >&5
+  echo "$as_me:4487: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_struct_timeval=yes
 else
@@ -4490,7 +4494,7 @@ emacs_cv_struct_timeval=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4493: result: $emacs_cv_struct_timeval" >&5
+echo "$as_me:4497: 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
@@ -4500,13 +4504,13 @@ EOF
 
 fi
 
-echo "$as_me:4503: checking for struct exception" >&5
+echo "$as_me:4507: 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 4509 "configure"
+#line 4513 "configure"
 #include "confdefs.h"
 #include <math.h>
 int
@@ -4518,16 +4522,16 @@ static struct exception x; x.arg1 = x.arg2 = x.retval; x.name = ""; x.type = 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4521: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4525: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4524: \$? = $ac_status" >&5
+  echo "$as_me:4528: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4530: \$? = $ac_status" >&5
+  echo "$as_me:4534: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_struct_exception=yes
 else
@@ -4537,7 +4541,7 @@ emacs_cv_struct_exception=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4540: result: $emacs_cv_struct_exception" >&5
+echo "$as_me:4544: 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
@@ -4547,13 +4551,13 @@ EOF
 
 fi
 
-echo "$as_me:4550: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "$as_me:4554: 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 4556 "configure"
+#line 4560 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -4567,16 +4571,16 @@ struct tm *tp; tp->tm_sec;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4570: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4574: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4573: \$? = $ac_status" >&5
+  echo "$as_me:4577: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4579: \$? = $ac_status" >&5
+  echo "$as_me:4583: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_tm=time.h
 else
@@ -4586,7 +4590,7 @@ ac_cv_struct_tm=sys/time.h
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4589: result: $ac_cv_struct_tm" >&5
+echo "$as_me:4593: result: $ac_cv_struct_tm" >&5
 echo "${ECHO_T}$ac_cv_struct_tm" >&6
 if test $ac_cv_struct_tm = sys/time.h; then
 
@@ -4596,13 +4600,13 @@ EOF
 
 fi
 
-echo "$as_me:4599: checking for struct tm.tm_zone" >&5
+echo "$as_me:4603: 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 4605 "configure"
+#line 4609 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -4618,16 +4622,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4621: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4625: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4624: \$? = $ac_status" >&5
+  echo "$as_me:4628: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4630: \$? = $ac_status" >&5
+  echo "$as_me:4634: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_tm_tm_zone=yes
 else
@@ -4637,7 +4641,7 @@ ac_cv_member_struct_tm_tm_zone=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4640: result: $ac_cv_member_struct_tm_tm_zone" >&5
+echo "$as_me:4644: 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
 
@@ -4654,13 +4658,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-  echo "$as_me:4657: checking for tzname" >&5
+  echo "$as_me:4661: 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 4663 "configure"
+#line 4667 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -4676,16 +4680,16 @@ atoi(*tzname);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4679: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4683: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4682: \$? = $ac_status" >&5
+  echo "$as_me:4686: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4688: \$? = $ac_status" >&5
+  echo "$as_me:4692: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_var_tzname=yes
 else
@@ -4695,7 +4699,7 @@ ac_cv_var_tzname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4698: result: $ac_cv_var_tzname" >&5
+echo "$as_me:4702: result: $ac_cv_var_tzname" >&5
 echo "${ECHO_T}$ac_cv_var_tzname" >&6
   if test $ac_cv_var_tzname = yes; then
 
@@ -4706,13 +4710,13 @@ EOF
   fi
 fi
 
-echo "$as_me:4709: checking for tm_gmtoff in struct tm" >&5
+echo "$as_me:4713: checking for tm_gmtoff in struct tm" >&5
 echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6
 if test "${emacs_cv_tm_gmtoff+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4715 "configure"
+#line 4719 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -4724,16 +4728,16 @@ struct tm t; t.tm_gmtoff = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4727: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4731: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4730: \$? = $ac_status" >&5
+  echo "$as_me:4734: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4736: \$? = $ac_status" >&5
+  echo "$as_me:4740: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_tm_gmtoff=yes
 else
@@ -4743,7 +4747,7 @@ emacs_cv_tm_gmtoff=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4746: result: $emacs_cv_tm_gmtoff" >&5
+echo "$as_me:4750: result: $emacs_cv_tm_gmtoff" >&5
 echo "${ECHO_T}$emacs_cv_tm_gmtoff" >&6
 if test $emacs_cv_tm_gmtoff = yes; then
   cat >>confdefs.h <<\EOF
@@ -4752,7 +4756,7 @@ EOF
 
 fi
 
-echo "$as_me:4755: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:4759: 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
@@ -4760,7 +4764,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 4763 "configure"
+#line 4767 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -4809,16 +4813,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4812: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4816: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4815: \$? = $ac_status" >&5
+  echo "$as_me:4819: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4821: \$? = $ac_status" >&5
+  echo "$as_me:4825: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -4835,18 +4839,18 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:4838: result: none needed" >&5
+    echo "$as_me:4842: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:4841: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:4845: 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:4846: checking for function prototypes" >&5
+echo "$as_me:4850: 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:4849: result: yes" >&5
+  echo "$as_me:4853: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -4854,17 +4858,17 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-  echo "$as_me:4857: result: no" >&5
+  echo "$as_me:4861: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:4861: checking for working volatile" >&5
+echo "$as_me:4865: 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 4867 "configure"
+#line 4871 "configure"
 #include "confdefs.h"
 
 int
@@ -4878,16 +4882,16 @@ int * volatile y;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4881: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4885: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4884: \$? = $ac_status" >&5
+  echo "$as_me:4888: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4890: \$? = $ac_status" >&5
+  echo "$as_me:4894: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_volatile=yes
 else
@@ -4897,7 +4901,7 @@ ac_cv_c_volatile=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4900: result: $ac_cv_c_volatile" >&5
+echo "$as_me:4904: result: $ac_cv_c_volatile" >&5
 echo "${ECHO_T}$ac_cv_c_volatile" >&6
 if test $ac_cv_c_volatile = no; then
 
@@ -4907,13 +4911,13 @@ EOF
 
 fi
 
-echo "$as_me:4910: checking for an ANSI C-conforming const" >&5
+echo "$as_me:4914: 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 4916 "configure"
+#line 4920 "configure"
 #include "confdefs.h"
 
 int
@@ -4971,16 +4975,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4974: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4978: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4977: \$? = $ac_status" >&5
+  echo "$as_me:4981: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4983: \$? = $ac_status" >&5
+  echo "$as_me:4987: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -4990,7 +4994,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4993: result: $ac_cv_c_const" >&5
+echo "$as_me:4997: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -5000,13 +5004,13 @@ EOF
 
 fi
 
-echo "$as_me:5003: checking for void * support" >&5
+echo "$as_me:5007: 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 5009 "configure"
+#line 5013 "configure"
 #include "confdefs.h"
 
 int
@@ -5018,16 +5022,16 @@ void * foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5025: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5024: \$? = $ac_status" >&5
+  echo "$as_me:5028: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5030: \$? = $ac_status" >&5
+  echo "$as_me:5034: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_void_star=yes
 else
@@ -5037,7 +5041,7 @@ emacs_cv_void_star=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5040: result: $emacs_cv_void_star" >&5
+echo "$as_me:5044: 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
@@ -5051,7 +5055,7 @@ EOF
 
 fi
 
-echo "$as_me:5054: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:5058: 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
@@ -5071,16 +5075,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:5074: result: yes" >&5
+  echo "$as_me:5078: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:5078: result: no" >&5
+  echo "$as_me:5082: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:5083: checking for long file names" >&5
+echo "$as_me:5087: 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
@@ -5119,7 +5123,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
   rm -rf $ac_xdir 2>/dev/null
 done
 fi
-echo "$as_me:5122: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:5126: 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
 
@@ -5131,7 +5135,7 @@ fi
 
 #### Choose a window system.
 
-echo "$as_me:5134: checking for X" >&5
+echo "$as_me:5138: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -5228,17 +5232,17 @@ if test "$ac_x_includes" = no; then
   # 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 5231 "configure"
+#line 5235 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:5235: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5239: \"$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:5241: \$? = $ac_status" >&5
+  echo "$as_me:5245: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5271,7 +5275,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 5274 "configure"
+#line 5278 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -5283,16 +5287,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5286: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5290: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5289: \$? = $ac_status" >&5
+  echo "$as_me:5293: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5295: \$? = $ac_status" >&5
+  echo "$as_me:5299: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -5330,7 +5334,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:5333: result: $have_x" >&5
+  echo "$as_me:5337: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -5340,7 +5344,7 @@ else
   # 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:5343: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:5347: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -5438,13 +5442,13 @@ UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"
 # Assume not, until told otherwise.
 GNU_MALLOC=yes
 doug_lea_malloc=yes
-echo "$as_me:5441: checking for malloc_get_state" >&5
+echo "$as_me:5445: 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 5447 "configure"
+#line 5451 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_get_state (); below.  */
@@ -5475,16 +5479,16 @@ f = malloc_get_state;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5478: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5482: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5481: \$? = $ac_status" >&5
+  echo "$as_me:5485: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5488: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5487: \$? = $ac_status" >&5
+  echo "$as_me:5491: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_malloc_get_state=yes
 else
@@ -5494,7 +5498,7 @@ ac_cv_func_malloc_get_state=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5497: result: $ac_cv_func_malloc_get_state" >&5
+echo "$as_me:5501: 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
   :
@@ -5502,13 +5506,13 @@ else
   doug_lea_malloc=no
 fi
 
-echo "$as_me:5505: checking for malloc_set_state" >&5
+echo "$as_me:5509: 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 5511 "configure"
+#line 5515 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_set_state (); below.  */
@@ -5539,16 +5543,16 @@ f = malloc_set_state;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5542: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5546: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5545: \$? = $ac_status" >&5
+  echo "$as_me:5549: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5548: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5551: \$? = $ac_status" >&5
+  echo "$as_me:5555: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_malloc_set_state=yes
 else
@@ -5558,7 +5562,7 @@ ac_cv_func_malloc_set_state=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5561: result: $ac_cv_func_malloc_set_state" >&5
+echo "$as_me:5565: 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
   :
@@ -5566,13 +5570,13 @@ else
   doug_lea_malloc=no
 fi
 
-echo "$as_me:5569: checking whether __after_morecore_hook exists" >&5
+echo "$as_me:5573: 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 5575 "configure"
+#line 5579 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int
@@ -5584,16 +5588,16 @@ __after_morecore_hook = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5587: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5591: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5590: \$? = $ac_status" >&5
+  echo "$as_me:5594: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5597: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5596: \$? = $ac_status" >&5
+  echo "$as_me:5600: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_var___after_morecore_hook=yes
 else
@@ -5603,7 +5607,7 @@ emacs_cv_var___after_morecore_hook=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5606: result: $emacs_cv_var___after_morecore_hook" >&5
+echo "$as_me:5610: 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
@@ -5634,28 +5638,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5637: checking for $ac_header" >&5
+echo "$as_me:5641: 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 5643 "configure"
+#line 5647 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5649: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5653: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5652: \$? = $ac_status" >&5
+  echo "$as_me:5656: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5658: \$? = $ac_status" >&5
+  echo "$as_me:5662: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -5665,7 +5669,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5668: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5672: 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
@@ -5678,23 +5682,23 @@ done
 for ac_header in stdlib.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5681: checking for $ac_header" >&5
+echo "$as_me:5685: 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 5687 "configure"
+#line 5691 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5691: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5695: \"$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:5697: \$? = $ac_status" >&5
+  echo "$as_me:5701: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5713,7 +5717,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5716: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5720: 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
@@ -5726,13 +5730,13 @@ done
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5729: checking for $ac_func" >&5
+echo "$as_me:5733: 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 5735 "configure"
+#line 5739 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5763,16 +5767,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5766: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5770: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5769: \$? = $ac_status" >&5
+  echo "$as_me:5773: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5775: \$? = $ac_status" >&5
+  echo "$as_me:5779: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5782,7 +5786,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5785: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5789: 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
@@ -5792,7 +5796,7 @@ EOF
 fi
 done
 
-echo "$as_me:5795: checking for working mmap" >&5
+echo "$as_me:5799: 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
@@ -5801,7 +5805,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5804 "configure"
+#line 5808 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -5928,15 +5932,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5931: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5935: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5934: \$? = $ac_status" >&5
+  echo "$as_me:5938: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5939: \$? = $ac_status" >&5
+  echo "$as_me:5943: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -5948,7 +5952,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:5951: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:5955: 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
 
@@ -5965,7 +5969,7 @@ fi
 
 LIBS="$libsrc_libs $LIBS"
 
-echo "$as_me:5968: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:5972: 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
@@ -5973,7 +5977,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5976 "configure"
+#line 5980 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5992,16 +5996,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5995: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5999: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5998: \$? = $ac_status" >&5
+  echo "$as_me:6002: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6004: \$? = $ac_status" >&5
+  echo "$as_me:6008: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -6012,7 +6016,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6015: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:6019: 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
@@ -6023,7 +6027,7 @@ EOF
 
 fi
 
-echo "$as_me:6026: checking for main in -lXbsd" >&5
+echo "$as_me:6030: 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
@@ -6031,7 +6035,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6034 "configure"
+#line 6038 "configure"
 #include "confdefs.h"
 
 int
@@ -6043,16 +6047,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6046: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6050: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6049: \$? = $ac_status" >&5
+  echo "$as_me:6053: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6056: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6055: \$? = $ac_status" >&5
+  echo "$as_me:6059: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xbsd_main=yes
 else
@@ -6063,13 +6067,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6066: result: $ac_cv_lib_Xbsd_main" >&5
+echo "$as_me:6070: 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:6072: checking for cma_open in -lpthreads" >&5
+echo "$as_me:6076: 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
@@ -6077,7 +6081,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthreads  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6080 "configure"
+#line 6084 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6096,16 +6100,16 @@ cma_open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6099: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6103: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6102: \$? = $ac_status" >&5
+  echo "$as_me:6106: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6108: \$? = $ac_status" >&5
+  echo "$as_me:6112: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_pthreads_cma_open=yes
 else
@@ -6116,7 +6120,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6119: result: $ac_cv_lib_pthreads_cma_open" >&5
+echo "$as_me:6123: 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
@@ -6127,7 +6131,7 @@ EOF
 
 fi
 
-echo "$as_me:6130: checking for XFree86 in /usr/X386" >&5
+echo "$as_me:6134: 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
@@ -6135,7 +6139,7 @@ if test -d /usr/X386/include; then
 else
   HAVE_XFREE386=no
 fi
-echo "$as_me:6138: result: $HAVE_XFREE386" >&5
+echo "$as_me:6142: result: $HAVE_XFREE386" >&5
 echo "${ECHO_T}$HAVE_XFREE386" >&6
 
 # Change CFLAGS temporarily so that C_SWITCH_X_SITE gets used
@@ -6160,10 +6164,10 @@ if test "${HAVE_X11}" = "yes"; then
   fi
 
   if test "${opsys}" = "gnu-linux"; then
-    echo "$as_me:6163: checking whether X on GNU/Linux needs -b to link" >&5
+    echo "$as_me:6167: 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 6166 "configure"
+#line 6170 "configure"
 #include "confdefs.h"
 
 int
@@ -6175,16 +6179,16 @@ XOpenDisplay ("foo");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6182: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6181: \$? = $ac_status" >&5
+  echo "$as_me:6185: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6187: \$? = $ac_status" >&5
+  echo "$as_me:6191: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   xlinux_first_failure=no
 else
@@ -6203,7 +6207,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       CPPFLAGS="$CPPFLAGS -b i486-linuxaout"
       LIBS="$LIBS -b i486-linuxaout"
       cat >conftest.$ac_ext <<_ACEOF
-#line 6206 "configure"
+#line 6210 "configure"
 #include "confdefs.h"
 
 int
@@ -6215,16 +6219,16 @@ XOpenDisplay ("foo");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6218: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6222: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6221: \$? = $ac_status" >&5
+  echo "$as_me:6225: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6224: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6228: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6227: \$? = $ac_status" >&5
+  echo "$as_me:6231: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   xlinux_second_failure=no
 else
@@ -6240,24 +6244,24 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	C_SWITCH_X_SITE="$OLD_C_SWITCH_X_SITE"
 	CPPFLAGS="$OLD_CPPFLAGS"
 	LIBS="$OLD_LIBS"
-        echo "$as_me:6243: result: no" >&5
+        echo "$as_me:6247: result: no" >&5
 echo "${ECHO_T}no" >&6
       else
-        echo "$as_me:6246: result: yes" >&5
+        echo "$as_me:6250: result: yes" >&5
 echo "${ECHO_T}yes" >&6
       fi
     else
-      echo "$as_me:6250: result: no" >&5
+      echo "$as_me:6254: 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:6257: checking for Xkb" >&5
+  echo "$as_me:6261: checking for Xkb" >&5
 echo $ECHO_N "checking for Xkb... $ECHO_C" >&6
   cat >conftest.$ac_ext <<_ACEOF
-#line 6260 "configure"
+#line 6264 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
@@ -6270,16 +6274,16 @@ XkbDescPtr kb = XkbGetKeyboard (0, XkbAllComponentsMask, XkbUseCoreKbd);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6273: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6277: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6276: \$? = $ac_status" >&5
+  echo "$as_me:6280: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6282: \$? = $ac_status" >&5
+  echo "$as_me:6286: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_xkb=yes
 else
@@ -6288,7 +6292,7 @@ cat conftest.$ac_ext >&5
 emacs_xkb=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  echo "$as_me:6291: result: $emacs_xkb" >&5
+  echo "$as_me:6295: result: $emacs_xkb" >&5
 echo "${ECHO_T}$emacs_xkb" >&6
   if test $emacs_xkb = yes; then
     cat >>confdefs.h <<\EOF
@@ -6301,13 +6305,13 @@ for ac_func in XrmSetDatabase XScreenResourceString \
 XScreenNumberOfScreen XSetWMProtocols
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6304: checking for $ac_func" >&5
+echo "$as_me:6308: 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 6310 "configure"
+#line 6314 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6338,16 +6342,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6341: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6345: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6344: \$? = $ac_status" >&5
+  echo "$as_me:6348: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6350: \$? = $ac_status" >&5
+  echo "$as_me:6354: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6357,7 +6361,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6360: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6364: 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
@@ -6370,13 +6374,13 @@ done
 fi
 
 if test "${window_system}" = "x11"; then
-  echo "$as_me:6373: checking X11 version 6" >&5
+  echo "$as_me:6377: 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 6379 "configure"
+#line 6383 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 int
@@ -6391,16 +6395,16 @@ fail;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6394: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6398: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6397: \$? = $ac_status" >&5
+  echo "$as_me:6401: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6403: \$? = $ac_status" >&5
+  echo "$as_me:6407: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_x11_version_6=yes
 else
@@ -6412,26 +6416,26 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
   if test $emacs_cv_x11_version_6 = yes; then
-    echo "$as_me:6415: result: 6 or newer" >&5
+    echo "$as_me:6419: result: 6 or newer" >&5
 echo "${ECHO_T}6 or newer" >&6
     cat >>confdefs.h <<\EOF
 #define HAVE_X11R6 1
 EOF
 
   else
-    echo "$as_me:6422: result: before 6" >&5
+    echo "$as_me:6426: result: before 6" >&5
 echo "${ECHO_T}before 6" >&6
   fi
 fi
 
 if test "${window_system}" = "x11"; then
-  echo "$as_me:6428: checking X11 version 5" >&5
+  echo "$as_me:6432: 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 6434 "configure"
+#line 6438 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 int
@@ -6446,16 +6450,16 @@ fail;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6449: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6453: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6452: \$? = $ac_status" >&5
+  echo "$as_me:6456: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6455: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6458: \$? = $ac_status" >&5
+  echo "$as_me:6462: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_x11_version_5=yes
 else
@@ -6467,7 +6471,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
   if test $emacs_cv_x11_version_5 = yes; then
-    echo "$as_me:6470: result: 5 or newer" >&5
+    echo "$as_me:6474: result: 5 or newer" >&5
 echo "${ECHO_T}5 or newer" >&6
     HAVE_X11R5=yes
     cat >>confdefs.h <<\EOF
@@ -6476,20 +6480,20 @@ EOF
 
   else
     HAVE_X11R5=no
-    echo "$as_me:6479: result: before 5" >&5
+    echo "$as_me:6483: 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:6486: checking X11 version 5 with Xaw" >&5
+    echo "$as_me:6490: 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 6492 "configure"
+#line 6496 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -6503,16 +6507,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6506: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6510: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6509: \$? = $ac_status" >&5
+  echo "$as_me:6513: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6515: \$? = $ac_status" >&5
+  echo "$as_me:6519: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_x11_version_5_with_xaw=yes
 else
@@ -6524,11 +6528,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
     if test $emacs_cv_x11_version_5_with_xaw = yes; then
-      echo "$as_me:6527: result: 5 or newer, with Xaw; use toolkit by default" >&5
+      echo "$as_me:6531: 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:6531: result: before 5 or no Xaw; do not use toolkit by default" >&5
+      echo "$as_me:6535: 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
@@ -6540,13 +6544,13 @@ fi
 X_TOOLKIT_TYPE=$USE_X_TOOLKIT
 
 if test "${USE_X_TOOLKIT}" != "none"; then
-  echo "$as_me:6543: checking X11 toolkit version" >&5
+  echo "$as_me:6547: 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 6549 "configure"
+#line 6553 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -6561,16 +6565,16 @@ fail;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6564: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6568: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6567: \$? = $ac_status" >&5
+  echo "$as_me:6571: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6573: \$? = $ac_status" >&5
+  echo "$as_me:6577: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_x11_toolkit_version_6=yes
 else
@@ -6583,14 +6587,14 @@ fi
 
   HAVE_X11XTR6=$emacs_cv_x11_toolkit_version_6
   if test $emacs_cv_x11_toolkit_version_6 = yes; then
-    echo "$as_me:6586: result: 6 or newer" >&5
+    echo "$as_me:6590: result: 6 or newer" >&5
 echo "${ECHO_T}6 or newer" >&6
     cat >>confdefs.h <<\EOF
 #define HAVE_X11XTR6 1
 EOF
 
   else
-    echo "$as_me:6593: result: before 6" >&5
+    echo "$as_me:6597: result: before 6" >&5
 echo "${ECHO_T}before 6" >&6
   fi
 
@@ -6601,7 +6605,7 @@ echo "${ECHO_T}before 6" >&6
     LIBS="-lXt $LIBS"
   fi
 
-echo "$as_me:6604: checking for XmuConvertStandardSelection in -lXmu" >&5
+echo "$as_me:6608: 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
@@ -6609,7 +6613,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXmu  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6612 "configure"
+#line 6616 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6628,16 +6632,16 @@ XmuConvertStandardSelection ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6631: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6635: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6634: \$? = $ac_status" >&5
+  echo "$as_me:6638: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6637: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6641: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6640: \$? = $ac_status" >&5
+  echo "$as_me:6644: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xmu_XmuConvertStandardSelection=yes
 else
@@ -6648,7 +6652,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6651: result: $ac_cv_lib_Xmu_XmuConvertStandardSelection" >&5
+echo "$as_me:6655: 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
@@ -6666,7 +6670,7 @@ fi
 if test "${HAVE_X11}" = "yes"; then
   if test "${USE_X_TOOLKIT}" != "none"; then
 
-echo "$as_me:6669: checking for XShapeQueryExtension in -lXext" >&5
+echo "$as_me:6673: 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
@@ -6674,7 +6678,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6677 "configure"
+#line 6681 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6693,16 +6697,16 @@ XShapeQueryExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6700: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6699: \$? = $ac_status" >&5
+  echo "$as_me:6703: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6706: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6705: \$? = $ac_status" >&5
+  echo "$as_me:6709: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XShapeQueryExtension=yes
 else
@@ -6713,7 +6717,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6716: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
+echo "$as_me:6720: 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
@@ -6728,13 +6732,13 @@ fi
 fi
 
 if test "${USE_X_TOOLKIT}" = "MOTIF"; then
-  echo "$as_me:6731: checking for Motif version 2.1" >&5
+  echo "$as_me:6735: 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 6737 "configure"
+#line 6741 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 int
@@ -6750,16 +6754,16 @@ Motif version prior to 2.1.
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6753: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6757: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6756: \$? = $ac_status" >&5
+  echo "$as_me:6760: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6763: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6762: \$? = $ac_status" >&5
+  echo "$as_me:6766: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_motif_version_2_1=yes
 else
@@ -6769,7 +6773,7 @@ emacs_cv_motif_version_2_1=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6772: result: $emacs_cv_motif_version_2_1" >&5
+echo "$as_me:6776: 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
@@ -6778,7 +6782,7 @@ echo "${ECHO_T}$emacs_cv_motif_version_2_1" >&6
 #define HAVE_MOTIF_2_1 1
 EOF
 
-    echo "$as_me:6781: checking for XpCreateContext in -lXp" >&5
+    echo "$as_me:6785: 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
@@ -6786,7 +6790,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXp  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6789 "configure"
+#line 6793 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6805,16 +6809,16 @@ XpCreateContext ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6812: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6811: \$? = $ac_status" >&5
+  echo "$as_me:6815: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6817: \$? = $ac_status" >&5
+  echo "$as_me:6821: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xp_XpCreateContext=yes
 else
@@ -6825,7 +6829,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6828: result: $ac_cv_lib_Xp_XpCreateContext" >&5
+echo "$as_me:6832: 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
@@ -6844,23 +6848,23 @@ fi
 HAVE_XAW3D=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${USE_X_TOOLKIT}" != "none"; then
-    echo "$as_me:6847: checking for X11/Xaw3d/Scrollbar.h" >&5
+    echo "$as_me:6851: 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 6853 "configure"
+#line 6857 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/Scrollbar.h>
 _ACEOF
-if { (eval echo "$as_me:6857: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6861: \"$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:6863: \$? = $ac_status" >&5
+  echo "$as_me:6867: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6879,10 +6883,10 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6882: result: $ac_cv_header_X11_Xaw3d_Scrollbar_h" >&5
+echo "$as_me:6886: 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:6885: checking for XawScrollbarSetThumb in -lXaw3d" >&5
+  echo "$as_me:6889: 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
@@ -6890,7 +6894,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXaw3d  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6893 "configure"
+#line 6897 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6909,16 +6913,16 @@ XawScrollbarSetThumb ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6912: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6916: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6915: \$? = $ac_status" >&5
+  echo "$as_me:6919: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6921: \$? = $ac_status" >&5
+  echo "$as_me:6925: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xaw3d_XawScrollbarSetThumb=yes
 else
@@ -6929,7 +6933,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6932: result: $ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&5
+echo "$as_me:6936: 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
@@ -6977,23 +6981,23 @@ fi
 HAVE_XPM=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${with_xpm}" != "no"; then
-    echo "$as_me:6980: checking for X11/xpm.h" >&5
+    echo "$as_me:6984: 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 6986 "configure"
+#line 6990 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 _ACEOF
-if { (eval echo "$as_me:6990: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6994: \"$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:6996: \$? = $ac_status" >&5
+  echo "$as_me:7000: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7012,10 +7016,10 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7015: result: $ac_cv_header_X11_xpm_h" >&5
+echo "$as_me:7019: 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:7018: checking for XpmReadFileToPixmap in -lXpm" >&5
+  echo "$as_me:7022: 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
@@ -7023,7 +7027,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm -lX11 $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7026 "configure"
+#line 7030 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7042,16 +7046,16 @@ XpmReadFileToPixmap ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7045: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7049: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7048: \$? = $ac_status" >&5
+  echo "$as_me:7052: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7054: \$? = $ac_status" >&5
+  echo "$as_me:7058: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xpm_XpmReadFileToPixmap=yes
 else
@@ -7062,7 +7066,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7065: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5
+echo "$as_me:7069: 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
@@ -7071,10 +7075,10 @@ fi
 fi
 
     if test "${HAVE_XPM}" = "yes"; then
-      echo "$as_me:7074: checking for XpmReturnAllocPixels preprocessor define" >&5
+      echo "$as_me:7078: checking for XpmReturnAllocPixels preprocessor define" >&5
 echo $ECHO_N "checking for XpmReturnAllocPixels preprocessor define... $ECHO_C" >&6
       cat >conftest.$ac_ext <<_ACEOF
-#line 7077 "configure"
+#line 7081 "configure"
 #include "confdefs.h"
 #include "X11/xpm.h"
 #ifndef XpmReturnAllocPixels
@@ -7091,10 +7095,10 @@ fi
 rm -f conftest*
 
       if test "${HAVE_XPM}" = "yes"; then
-	echo "$as_me:7094: result: yes" >&5
+	echo "$as_me:7098: result: yes" >&5
 echo "${ECHO_T}yes" >&6
       else
-	echo "$as_me:7097: result: no" >&5
+	echo "$as_me:7101: result: no" >&5
 echo "${ECHO_T}no" >&6
       fi
     fi
@@ -7112,23 +7116,23 @@ fi
 HAVE_JPEG=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${with_jpeg}" != "no"; then
-            echo "$as_me:7115: checking for jerror.h" >&5
+            echo "$as_me:7119: 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 7121 "configure"
+#line 7125 "configure"
 #include "confdefs.h"
 #include <jerror.h>
 _ACEOF
-if { (eval echo "$as_me:7125: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7129: \"$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:7131: \$? = $ac_status" >&5
+  echo "$as_me:7135: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7147,10 +7151,10 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7150: result: $ac_cv_header_jerror_h" >&5
+echo "$as_me:7154: 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:7153: checking for jpeg_destroy_compress in -ljpeg" >&5
+  echo "$as_me:7157: 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
@@ -7158,7 +7162,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljpeg  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7161 "configure"
+#line 7165 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7177,16 +7181,16 @@ jpeg_destroy_compress ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7180: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7184: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7183: \$? = $ac_status" >&5
+  echo "$as_me:7187: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7189: \$? = $ac_status" >&5
+  echo "$as_me:7193: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_jpeg_jpeg_destroy_compress=yes
 else
@@ -7197,7 +7201,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7200: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5
+echo "$as_me:7204: 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
@@ -7219,23 +7223,23 @@ fi
 HAVE_PNG=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${with_png}" != "no"; then
-    echo "$as_me:7222: checking for png.h" >&5
+    echo "$as_me:7226: 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 7228 "configure"
+#line 7232 "configure"
 #include "confdefs.h"
 #include <png.h>
 _ACEOF
-if { (eval echo "$as_me:7232: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7236: \"$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:7238: \$? = $ac_status" >&5
+  echo "$as_me:7242: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7254,10 +7258,10 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7257: result: $ac_cv_header_png_h" >&5
+echo "$as_me:7261: 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:7260: checking for png_get_channels in -lpng" >&5
+  echo "$as_me:7264: 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
@@ -7265,7 +7269,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpng -lz -lm $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7268 "configure"
+#line 7272 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7284,16 +7288,16 @@ png_get_channels ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7287: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7291: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7290: \$? = $ac_status" >&5
+  echo "$as_me:7294: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7297: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7296: \$? = $ac_status" >&5
+  echo "$as_me:7300: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_png_png_get_channels=yes
 else
@@ -7304,7 +7308,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7307: result: $ac_cv_lib_png_png_get_channels" >&5
+echo "$as_me:7311: 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
@@ -7326,23 +7330,23 @@ fi
 HAVE_TIFF=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${with_tiff}" != "no"; then
-    echo "$as_me:7329: checking for tiffio.h" >&5
+    echo "$as_me:7333: 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 7335 "configure"
+#line 7339 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 _ACEOF
-if { (eval echo "$as_me:7339: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7343: \"$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:7345: \$? = $ac_status" >&5
+  echo "$as_me:7349: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7361,13 +7365,13 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7364: result: $ac_cv_header_tiffio_h" >&5
+echo "$as_me:7368: 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:7370: checking for TIFFGetVersion in -ltiff" >&5
+      echo "$as_me:7374: 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
@@ -7375,7 +7379,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltiff $tifflibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7378 "configure"
+#line 7382 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7394,16 +7398,16 @@ TIFFGetVersion ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7397: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7401: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7400: \$? = $ac_status" >&5
+  echo "$as_me:7404: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7406: \$? = $ac_status" >&5
+  echo "$as_me:7410: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_tiff_TIFFGetVersion=yes
 else
@@ -7414,7 +7418,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7417: result: $ac_cv_lib_tiff_TIFFGetVersion" >&5
+echo "$as_me:7421: 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
@@ -7436,23 +7440,23 @@ fi
 HAVE_GIF=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${with_gif}" != "no"; then
-    echo "$as_me:7439: checking for gif_lib.h" >&5
+    echo "$as_me:7443: 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 7445 "configure"
+#line 7449 "configure"
 #include "confdefs.h"
 #include <gif_lib.h>
 _ACEOF
-if { (eval echo "$as_me:7449: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7453: \"$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:7455: \$? = $ac_status" >&5
+  echo "$as_me:7459: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7471,10 +7475,10 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7474: result: $ac_cv_header_gif_lib_h" >&5
+echo "$as_me:7478: 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
-  echo "$as_me:7477: checking for DGifOpen in -lungif" >&5
+  echo "$as_me:7481: checking for DGifOpen in -lungif" >&5
 echo $ECHO_N "checking for DGifOpen in -lungif... $ECHO_C" >&6
 if test "${ac_cv_lib_ungif_DGifOpen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7482,7 +7486,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lungif  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7485 "configure"
+#line 7489 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7501,16 +7505,16 @@ DGifOpen ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7504: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7508: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7507: \$? = $ac_status" >&5
+  echo "$as_me:7511: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7513: \$? = $ac_status" >&5
+  echo "$as_me:7517: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ungif_DGifOpen=yes
 else
@@ -7521,7 +7525,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7524: result: $ac_cv_lib_ungif_DGifOpen" >&5
+echo "$as_me:7528: result: $ac_cv_lib_ungif_DGifOpen" >&5
 echo "${ECHO_T}$ac_cv_lib_ungif_DGifOpen" >&6
 if test $ac_cv_lib_ungif_DGifOpen = yes; then
   HAVE_GIF=yes
@@ -7540,13 +7544,13 @@ EOF
 fi
 
 # If netdb.h doesn't declare h_errno, we must declare it by hand.
-echo "$as_me:7543: checking whether netdb declares h_errno" >&5
+echo "$as_me:7547: 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 7549 "configure"
+#line 7553 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int
@@ -7558,16 +7562,16 @@ return h_errno;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7561: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7565: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7564: \$? = $ac_status" >&5
+  echo "$as_me:7568: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7567: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7571: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7570: \$? = $ac_status" >&5
+  echo "$as_me:7574: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_netdb_declares_h_errno=yes
 else
@@ -7577,7 +7581,7 @@ emacs_cv_netdb_declares_h_errno=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7580: result: $emacs_cv_netdb_declares_h_errno" >&5
+echo "$as_me:7584: 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
   cat >>confdefs.h <<\EOF
@@ -7588,13 +7592,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:7591: checking for working alloca.h" >&5
+echo "$as_me:7595: 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 7597 "configure"
+#line 7601 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -7606,16 +7610,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7609: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7613: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7612: \$? = $ac_status" >&5
+  echo "$as_me:7616: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7618: \$? = $ac_status" >&5
+  echo "$as_me:7622: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -7625,7 +7629,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7628: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:7632: 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
 
@@ -7635,13 +7639,13 @@ EOF
 
 fi
 
-echo "$as_me:7638: checking for alloca" >&5
+echo "$as_me:7642: 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 7644 "configure"
+#line 7648 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -7673,16 +7677,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7676: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7680: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7679: \$? = $ac_status" >&5
+  echo "$as_me:7683: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7685: \$? = $ac_status" >&5
+  echo "$as_me:7689: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -7692,7 +7696,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7695: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:7699: 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
@@ -7713,13 +7717,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:7716: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:7720: 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 7722 "configure"
+#line 7726 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -7737,18 +7741,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:7740: result: $ac_cv_os_cray" >&5
+echo "$as_me:7744: 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:7745: checking for $ac_func" >&5
+echo "$as_me:7749: 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 7751 "configure"
+#line 7755 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7779,16 +7783,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7782: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7786: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7785: \$? = $ac_status" >&5
+  echo "$as_me:7789: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7788: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7791: \$? = $ac_status" >&5
+  echo "$as_me:7795: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -7798,7 +7802,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7801: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7805: 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
 
@@ -7812,7 +7816,7 @@ fi
   done
 fi
 
-echo "$as_me:7815: checking stack direction for C alloca" >&5
+echo "$as_me:7819: 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
@@ -7821,7 +7825,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7824 "configure"
+#line 7828 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -7844,15 +7848,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7847: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7850: \$? = $ac_status" >&5
+  echo "$as_me:7854: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7856: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7855: \$? = $ac_status" >&5
+  echo "$as_me:7859: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -7864,7 +7868,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:7867: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:7871: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -7876,7 +7880,7 @@ fi
 # 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:7879: checking for sqrt in -lm" >&5
+echo "$as_me:7883: 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
@@ -7884,7 +7888,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7887 "configure"
+#line 7891 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7903,16 +7907,16 @@ sqrt ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7906: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7910: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7909: \$? = $ac_status" >&5
+  echo "$as_me:7913: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7916: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7915: \$? = $ac_status" >&5
+  echo "$as_me:7919: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_sqrt=yes
 else
@@ -7923,7 +7927,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7926: result: $ac_cv_lib_m_sqrt" >&5
+echo "$as_me:7930: 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
@@ -7936,7 +7940,7 @@ fi
 
 # Check for mail-locking functions in a "mail" library
 
-echo "$as_me:7939: checking for maillock in -lmail" >&5
+echo "$as_me:7943: 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
@@ -7944,7 +7948,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmail  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7947 "configure"
+#line 7951 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7963,16 +7967,16 @@ maillock ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7966: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7970: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7969: \$? = $ac_status" >&5
+  echo "$as_me:7973: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7975: \$? = $ac_status" >&5
+  echo "$as_me:7979: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mail_maillock=yes
 else
@@ -7983,7 +7987,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7986: result: $ac_cv_lib_mail_maillock" >&5
+echo "$as_me:7990: 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
@@ -7994,7 +7998,7 @@ EOF
 
 fi
 
-echo "$as_me:7997: checking for maillock in -llockfile" >&5
+echo "$as_me:8001: 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
@@ -8002,7 +8006,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-llockfile  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8005 "configure"
+#line 8009 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8021,16 +8025,16 @@ maillock ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8024: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8028: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8027: \$? = $ac_status" >&5
+  echo "$as_me:8031: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8033: \$? = $ac_status" >&5
+  echo "$as_me:8037: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_lockfile_maillock=yes
 else
@@ -8041,7 +8045,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8044: result: $ac_cv_lib_lockfile_maillock" >&5
+echo "$as_me:8048: 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
@@ -8058,7 +8062,7 @@ fi
 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:8061: checking for $ac_word" >&5
+echo "$as_me:8065: 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
@@ -8073,7 +8077,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_liblockfile="yes"
-echo "$as_me:8076: found $ac_dir/$ac_word" >&5
+echo "$as_me:8080: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8082,15 +8086,15 @@ fi
 fi
 liblockfile=$ac_cv_prog_liblockfile
 if test -n "$liblockfile"; then
-  echo "$as_me:8085: result: $liblockfile" >&5
+  echo "$as_me:8089: result: $liblockfile" >&5
 echo "${ECHO_T}$liblockfile" >&6
 else
-  echo "$as_me:8088: result: no" >&5
+  echo "$as_me:8092: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   if test $ac_cv_prog_liblockfile = yes; then
-    { { echo "$as_me:8093: error: Shared liblockfile found but can't link against it.
+    { { echo "$as_me:8097: 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.
@@ -8108,13 +8112,13 @@ fi
 for ac_func in touchlock
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8111: checking for $ac_func" >&5
+echo "$as_me:8115: 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 8117 "configure"
+#line 8121 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8145,16 +8149,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8148: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8152: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8151: \$? = $ac_status" >&5
+  echo "$as_me:8155: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8158: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8157: \$? = $ac_status" >&5
+  echo "$as_me:8161: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8164,7 +8168,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8167: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8171: 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
@@ -8177,23 +8181,23 @@ done
 for ac_header in maillock.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8180: checking for $ac_header" >&5
+echo "$as_me:8184: 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 8186 "configure"
+#line 8190 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8190: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8194: \"$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:8196: \$? = $ac_status" >&5
+  echo "$as_me:8200: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8212,7 +8216,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8215: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8219: 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
@@ -8227,17 +8231,17 @@ rename closedir mkdir rmdir sysinfo \
 random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \
 strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \
 utimes setrlimit setpgid getcwd getwd shutdown strftime getaddrinfo \
-__fpending mblen mbrlen strsignal setitimer ualarm index rindex \
+__fpending mblen mbrlen mbsinit strsignal setitimer ualarm index rindex \
 gai_strerror mkstemp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8234: checking for $ac_func" >&5
+echo "$as_me:8238: 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 8240 "configure"
+#line 8244 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8268,16 +8272,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8271: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8275: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8274: \$? = $ac_status" >&5
+  echo "$as_me:8278: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8280: \$? = $ac_status" >&5
+  echo "$as_me:8284: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8287,7 +8291,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8290: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8294: 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
@@ -8300,23 +8304,23 @@ done
 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:8303: checking for $ac_header" >&5
+echo "$as_me:8307: 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 8309 "configure"
+#line 8313 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8313: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8317: \"$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:8319: \$? = $ac_status" >&5
+  echo "$as_me:8323: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8335,7 +8339,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8338: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8342: 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
@@ -8348,13 +8352,13 @@ done
 for ac_func in alarm
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8351: checking for $ac_func" >&5
+echo "$as_me:8355: 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 8357 "configure"
+#line 8361 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8385,16 +8389,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8388: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8392: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8391: \$? = $ac_status" >&5
+  echo "$as_me:8395: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8398: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8397: \$? = $ac_status" >&5
+  echo "$as_me:8401: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8404,7 +8408,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8407: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8411: 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
@@ -8414,7 +8418,7 @@ EOF
 fi
 done
 
-echo "$as_me:8417: checking for working mktime" >&5
+echo "$as_me:8421: 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
@@ -8423,7 +8427,7 @@ else
   ac_cv_func_working_mktime=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8426 "configure"
+#line 8430 "configure"
 #include "confdefs.h"
 /* Test program from Paul Eggert and Tony Leneis.  */
 #if TIME_WITH_SYS_TIME
@@ -8572,15 +8576,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8575: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8579: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8578: \$? = $ac_status" >&5
+  echo "$as_me:8582: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8584: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8583: \$? = $ac_status" >&5
+  echo "$as_me:8587: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_working_mktime=yes
 else
@@ -8592,7 +8596,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:8595: result: $ac_cv_func_working_mktime" >&5
+echo "$as_me:8599: 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"
@@ -8610,13 +8614,13 @@ ac_have_func=no # yes means we've found a way to get the load average.
 ac_save_LIBS=$LIBS
 
 # Check for getloadavg, but be sure not to touch the cache variable.
-(echo "$as_me:8613: checking for getloadavg" >&5
+(echo "$as_me:8617: 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 8619 "configure"
+#line 8623 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getloadavg (); below.  */
@@ -8647,16 +8651,16 @@ f = getloadavg;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8654: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8653: \$? = $ac_status" >&5
+  echo "$as_me:8657: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8659: \$? = $ac_status" >&5
+  echo "$as_me:8663: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getloadavg=yes
 else
@@ -8666,7 +8670,7 @@ ac_cv_func_getloadavg=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8669: result: $ac_cv_func_getloadavg" >&5
+echo "$as_me:8673: result: $ac_cv_func_getloadavg" >&5
 echo "${ECHO_T}$ac_cv_func_getloadavg" >&6
 if test $ac_cv_func_getloadavg = yes; then
   exit 0
@@ -8680,13 +8684,13 @@ fi
 for ac_func in pstat_getdynamic
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8683: checking for $ac_func" >&5
+echo "$as_me:8687: 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 8689 "configure"
+#line 8693 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8717,16 +8721,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8720: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8724: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8723: \$? = $ac_status" >&5
+  echo "$as_me:8727: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8730: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8729: \$? = $ac_status" >&5
+  echo "$as_me:8733: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8736,7 +8740,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8739: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8743: 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
@@ -8748,7 +8752,7 @@ done
 
 # Solaris has libkstat which does not require root.
 
-echo "$as_me:8751: checking for kstat_open in -lkstat" >&5
+echo "$as_me:8755: 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
@@ -8756,7 +8760,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkstat  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8759 "configure"
+#line 8763 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8775,16 +8779,16 @@ kstat_open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8778: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8782: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8781: \$? = $ac_status" >&5
+  echo "$as_me:8785: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8784: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8788: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8787: \$? = $ac_status" >&5
+  echo "$as_me:8791: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_kstat_kstat_open=yes
 else
@@ -8795,7 +8799,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8798: result: $ac_cv_lib_kstat_kstat_open" >&5
+echo "$as_me:8802: 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
@@ -8813,7 +8817,7 @@ test $ac_cv_lib_kstat_kstat_open = yes && ac_have_func=yes
 # 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:8816: checking for elf_begin in -lelf" >&5
+  echo "$as_me:8820: 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
@@ -8821,7 +8825,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lelf  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8824 "configure"
+#line 8828 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8840,16 +8844,16 @@ elf_begin ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8843: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8847: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8846: \$? = $ac_status" >&5
+  echo "$as_me:8850: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8852: \$? = $ac_status" >&5
+  echo "$as_me:8856: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_elf_elf_begin=yes
 else
@@ -8860,7 +8864,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8863: result: $ac_cv_lib_elf_elf_begin" >&5
+echo "$as_me:8867: 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"
@@ -8868,7 +8872,7 @@ fi
 
 fi
 if test $ac_have_func = no; then
-  echo "$as_me:8871: checking for kvm_open in -lkvm" >&5
+  echo "$as_me:8875: 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
@@ -8876,7 +8880,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkvm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8879 "configure"
+#line 8883 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8895,16 +8899,16 @@ kvm_open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8898: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8902: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8901: \$? = $ac_status" >&5
+  echo "$as_me:8905: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8904: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8908: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8907: \$? = $ac_status" >&5
+  echo "$as_me:8911: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_kvm_kvm_open=yes
 else
@@ -8915,14 +8919,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8918: result: $ac_cv_lib_kvm_kvm_open" >&5
+echo "$as_me:8922: 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:8925: checking for getloadavg in -lutil" >&5
+  echo "$as_me:8929: 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
@@ -8930,7 +8934,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8933 "configure"
+#line 8937 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8949,16 +8953,16 @@ getloadavg ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8952: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8956: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8955: \$? = $ac_status" >&5
+  echo "$as_me:8959: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8962: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8961: \$? = $ac_status" >&5
+  echo "$as_me:8965: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_util_getloadavg=yes
 else
@@ -8969,7 +8973,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8972: result: $ac_cv_lib_util_getloadavg" >&5
+echo "$as_me:8976: 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
@@ -8982,7 +8986,7 @@ if test $ac_have_func = no; then
   # 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:8985: checking for getloadavg in -lgetloadavg" >&5
+  echo "$as_me:8989: 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
@@ -8990,7 +8994,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgetloadavg  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8993 "configure"
+#line 8997 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9009,16 +9013,16 @@ getloadavg ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9012: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9016: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9015: \$? = $ac_status" >&5
+  echo "$as_me:9019: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9021: \$? = $ac_status" >&5
+  echo "$as_me:9025: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_getloadavg_getloadavg=yes
 else
@@ -9029,7 +9033,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9032: result: $ac_cv_lib_getloadavg_getloadavg" >&5
+echo "$as_me:9036: 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"
@@ -9045,13 +9049,13 @@ fi
 for ac_func in getloadavg
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9048: checking for $ac_func" >&5
+echo "$as_me:9052: 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 9054 "configure"
+#line 9058 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9082,16 +9086,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9085: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9089: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9088: \$? = $ac_status" >&5
+  echo "$as_me:9092: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9094: \$? = $ac_status" >&5
+  echo "$as_me:9098: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9101,7 +9105,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9104: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9108: 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
@@ -9117,23 +9121,23 @@ EOF
 
 # Figure out what our getloadavg.c needs.
 ac_have_func=no
-echo "$as_me:9120: checking for sys/dg_sys_info.h" >&5
+echo "$as_me:9124: 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 9126 "configure"
+#line 9130 "configure"
 #include "confdefs.h"
 #include <sys/dg_sys_info.h>
 _ACEOF
-if { (eval echo "$as_me:9130: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9134: \"$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:9136: \$? = $ac_status" >&5
+  echo "$as_me:9140: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9152,7 +9156,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9155: result: $ac_cv_header_sys_dg_sys_info_h" >&5
+echo "$as_me:9159: 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
@@ -9161,7 +9165,7 @@ cat >>confdefs.h <<\EOF
 #define DGUX 1
 EOF
 
-echo "$as_me:9164: checking for dg_sys_info in -ldgc" >&5
+echo "$as_me:9168: 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
@@ -9169,7 +9173,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldgc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9172 "configure"
+#line 9176 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9188,16 +9192,16 @@ dg_sys_info ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9191: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9195: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9194: \$? = $ac_status" >&5
+  echo "$as_me:9198: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9197: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9200: \$? = $ac_status" >&5
+  echo "$as_me:9204: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dgc_dg_sys_info=yes
 else
@@ -9208,7 +9212,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9211: result: $ac_cv_lib_dgc_dg_sys_info" >&5
+echo "$as_me:9215: 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
@@ -9221,23 +9225,23 @@ fi
 
 fi
 
-echo "$as_me:9224: checking for locale.h" >&5
+echo "$as_me:9228: 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 9230 "configure"
+#line 9234 "configure"
 #include "confdefs.h"
 #include <locale.h>
 _ACEOF
-if { (eval echo "$as_me:9234: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9238: \"$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:9240: \$? = $ac_status" >&5
+  echo "$as_me:9244: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9256,19 +9260,19 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9259: result: $ac_cv_header_locale_h" >&5
+echo "$as_me:9263: 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:9265: checking for $ac_func" >&5
+echo "$as_me:9269: 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 9271 "configure"
+#line 9275 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9299,16 +9303,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9302: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9306: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9305: \$? = $ac_status" >&5
+  echo "$as_me:9309: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9308: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9311: \$? = $ac_status" >&5
+  echo "$as_me:9315: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9318,7 +9322,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9321: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9325: 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
@@ -9341,23 +9345,23 @@ EOF
 fi
 
 if test $ac_have_func = no; then
-  echo "$as_me:9344: checking for inq_stats/cpustats.h" >&5
+  echo "$as_me:9348: 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 9350 "configure"
+#line 9354 "configure"
 #include "confdefs.h"
 #include <inq_stats/cpustats.h>
 _ACEOF
-if { (eval echo "$as_me:9354: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9358: \"$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:9360: \$? = $ac_status" >&5
+  echo "$as_me:9364: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9376,7 +9380,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9379: result: $ac_cv_header_inq_stats_cpustats_h" >&5
+echo "$as_me:9383: 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
@@ -9394,23 +9398,23 @@ fi
 fi
 
 if test $ac_have_func = no; then
-  echo "$as_me:9397: checking for sys/cpustats.h" >&5
+  echo "$as_me:9401: 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 9403 "configure"
+#line 9407 "configure"
 #include "confdefs.h"
 #include <sys/cpustats.h>
 _ACEOF
-if { (eval echo "$as_me:9407: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9411: \"$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:9413: \$? = $ac_status" >&5
+  echo "$as_me:9417: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9429,7 +9433,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9432: result: $ac_cv_header_sys_cpustats_h" >&5
+echo "$as_me:9436: 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
@@ -9445,23 +9449,23 @@ if test $ac_have_func = no; then
 for ac_header in mach/mach.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9448: checking for $ac_header" >&5
+echo "$as_me:9452: 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 9454 "configure"
+#line 9458 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9458: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9462: \"$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:9464: \$? = $ac_status" >&5
+  echo "$as_me:9468: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9480,7 +9484,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9483: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9487: 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
@@ -9495,23 +9499,23 @@ fi
 for ac_header in nlist.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9498: checking for $ac_header" >&5
+echo "$as_me:9502: 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 9504 "configure"
+#line 9508 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9508: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9512: \"$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:9514: \$? = $ac_status" >&5
+  echo "$as_me:9518: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9530,19 +9534,19 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9533: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9537: 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:9539: checking for struct nlist.n_un.n_name" >&5
+ echo "$as_me:9543: 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 9545 "configure"
+#line 9549 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 
@@ -9557,16 +9561,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9560: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9564: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9563: \$? = $ac_status" >&5
+  echo "$as_me:9567: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9569: \$? = $ac_status" >&5
+  echo "$as_me:9573: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_nlist_n_un_n_name=yes
 else
@@ -9576,7 +9580,7 @@ ac_cv_member_struct_nlist_n_un_n_name=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9579: result: $ac_cv_member_struct_nlist_n_un_n_name" >&5
+echo "$as_me:9583: 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
 
@@ -9597,13 +9601,13 @@ fi
 done
 
 # Some definitions of getloadavg require that the program be installed setgid.
-echo "$as_me:9600: checking whether getloadavg requires setgid" >&5
+echo "$as_me:9604: 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 9606 "configure"
+#line 9610 "configure"
 #include "confdefs.h"
 #include "$srcdir/getloadavg.c"
 #ifdef LDAV_PRIVILEGED
@@ -9619,7 +9623,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:9622: result: $ac_cv_func_getloadavg_setgid" >&5
+echo "$as_me:9626: 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
@@ -9633,7 +9637,7 @@ else
 fi
 
 if test $ac_cv_func_getloadavg_setgid = yes; then
-  echo "$as_me:9636: checking group of /dev/kmem" >&5
+  echo "$as_me:9640: 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
@@ -9648,7 +9652,7 @@ else
 	       / /s/.* //;p;'`
 
 fi
-echo "$as_me:9651: result: $ac_cv_group_kmem" >&5
+echo "$as_me:9655: result: $ac_cv_group_kmem" >&5
 echo "${ECHO_T}$ac_cv_group_kmem" >&6
   KMEM_GROUP=$ac_cv_group_kmem
 fi
@@ -9659,7 +9663,7 @@ else
 fi
 LIBS=$ac_save_LIBS
 
-echo "$as_me:9662: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "$as_me:9666: 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
@@ -9667,7 +9671,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 9670 "configure"
+#line 9674 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9679,16 +9683,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9682: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9686: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9685: \$? = $ac_status" >&5
+  echo "$as_me:9689: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9688: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9692: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9691: \$? = $ac_status" >&5
+  echo "$as_me:9695: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -9697,7 +9701,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 9700 "configure"
+#line 9704 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -9710,16 +9714,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9713: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9717: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9716: \$? = $ac_status" >&5
+  echo "$as_me:9720: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9719: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9723: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9722: \$? = $ac_status" >&5
+  echo "$as_me:9726: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -9730,7 +9734,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:9733: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:9737: 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
 
@@ -9744,13 +9748,13 @@ rm -f conftest*
 # 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:9747: checking for fseeko" >&5
+echo "$as_me:9751: 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 9753 "configure"
+#line 9757 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9762,16 +9766,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9765: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9769: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9768: \$? = $ac_status" >&5
+  echo "$as_me:9772: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9774: \$? = $ac_status" >&5
+  echo "$as_me:9778: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -9781,7 +9785,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9784: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:9788: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -9796,13 +9800,13 @@ fi
 for ac_func in grantpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9799: checking for $ac_func" >&5
+echo "$as_me:9803: 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 9805 "configure"
+#line 9809 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9833,16 +9837,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9836: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9840: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9839: \$? = $ac_status" >&5
+  echo "$as_me:9843: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9842: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9846: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9845: \$? = $ac_status" >&5
+  echo "$as_me:9849: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9852,7 +9856,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9855: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9859: 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
@@ -9867,13 +9871,13 @@ done
 for ac_func in getpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9870: checking for $ac_func" >&5
+echo "$as_me:9874: 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 9876 "configure"
+#line 9880 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9904,16 +9908,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9907: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9911: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9910: \$? = $ac_status" >&5
+  echo "$as_me:9914: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9916: \$? = $ac_status" >&5
+  echo "$as_me:9920: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9923,7 +9927,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9926: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9930: 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
@@ -9938,7 +9942,7 @@ done
 # It's better to believe a function is not available
 # than to expect to find it in ncurses.
 
-echo "$as_me:9941: checking for tparm in -lncurses" >&5
+echo "$as_me:9945: 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
@@ -9946,7 +9950,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9949 "configure"
+#line 9953 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9965,16 +9969,16 @@ tparm ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9968: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9972: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9971: \$? = $ac_status" >&5
+  echo "$as_me:9975: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9977: \$? = $ac_status" >&5
+  echo "$as_me:9981: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ncurses_tparm=yes
 else
@@ -9985,7 +9989,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9988: result: $ac_cv_lib_ncurses_tparm" >&5
+echo "$as_me:9992: 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
@@ -10000,13 +10004,13 @@ fi
 if test "$with_hesiod" = yes ; then
   # Don't set $LIBS here -- see comments above.
   resolv=no
-  echo "$as_me:10003: checking for res_send" >&5
+  echo "$as_me:10007: 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 10009 "configure"
+#line 10013 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char res_send (); below.  */
@@ -10037,16 +10041,16 @@ f = res_send;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10040: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10044: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10043: \$? = $ac_status" >&5
+  echo "$as_me:10047: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10049: \$? = $ac_status" >&5
+  echo "$as_me:10053: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_res_send=yes
 else
@@ -10056,18 +10060,18 @@ ac_cv_func_res_send=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10059: result: $ac_cv_func_res_send" >&5
+echo "$as_me:10063: 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:10064: checking for __res_send" >&5
+  echo "$as_me:10068: 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 10070 "configure"
+#line 10074 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char __res_send (); below.  */
@@ -10098,16 +10102,16 @@ f = __res_send;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10101: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10105: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10104: \$? = $ac_status" >&5
+  echo "$as_me:10108: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10110: \$? = $ac_status" >&5
+  echo "$as_me:10114: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func___res_send=yes
 else
@@ -10117,12 +10121,12 @@ ac_cv_func___res_send=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10120: result: $ac_cv_func___res_send" >&5
+echo "$as_me:10124: 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:10125: checking for res_send in -lresolv" >&5
+  echo "$as_me:10129: 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
@@ -10130,7 +10134,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10133 "configure"
+#line 10137 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10149,16 +10153,16 @@ res_send ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10152: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10156: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10155: \$? = $ac_status" >&5
+  echo "$as_me:10159: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10158: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10162: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10161: \$? = $ac_status" >&5
+  echo "$as_me:10165: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv_res_send=yes
 else
@@ -10169,12 +10173,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10172: result: $ac_cv_lib_resolv_res_send" >&5
+echo "$as_me:10176: 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:10177: checking for __res_send in -lresolv" >&5
+  echo "$as_me:10181: 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
@@ -10182,7 +10186,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10185 "configure"
+#line 10189 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10201,16 +10205,16 @@ __res_send ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10204: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10208: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10207: \$? = $ac_status" >&5
+  echo "$as_me:10211: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10213: \$? = $ac_status" >&5
+  echo "$as_me:10217: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv___res_send=yes
 else
@@ -10221,7 +10225,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10224: result: $ac_cv_lib_resolv___res_send" >&5
+echo "$as_me:10228: 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
@@ -10242,13 +10246,13 @@ EOF
   else
     RESOLVLIB=
   fi
-  echo "$as_me:10245: checking for hes_getmailhost" >&5
+  echo "$as_me:10249: 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 10251 "configure"
+#line 10255 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char hes_getmailhost (); below.  */
@@ -10279,16 +10283,16 @@ f = hes_getmailhost;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10282: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10286: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10285: \$? = $ac_status" >&5
+  echo "$as_me:10289: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10288: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10291: \$? = $ac_status" >&5
+  echo "$as_me:10295: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_hes_getmailhost=yes
 else
@@ -10298,12 +10302,12 @@ ac_cv_func_hes_getmailhost=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10301: result: $ac_cv_func_hes_getmailhost" >&5
+echo "$as_me:10305: 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:10306: checking for hes_getmailhost in -lhesiod" >&5
+  echo "$as_me:10310: 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
@@ -10311,7 +10315,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhesiod $RESOLVLIB $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10314 "configure"
+#line 10318 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10330,16 +10334,16 @@ hes_getmailhost ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10333: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10337: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10336: \$? = $ac_status" >&5
+  echo "$as_me:10340: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10343: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10342: \$? = $ac_status" >&5
+  echo "$as_me:10346: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_hesiod_hes_getmailhost=yes
 else
@@ -10350,7 +10354,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10353: result: $ac_cv_lib_hesiod_hes_getmailhost" >&5
+echo "$as_me:10357: 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
   cat >>confdefs.h <<\EOF
@@ -10368,7 +10372,7 @@ fi
 # These tell us which Kerberos-related libraries to use.
 if test "${with_kerberos+set}" = set; then
 
-echo "$as_me:10371: checking for com_err in -lcom_err" >&5
+echo "$as_me:10375: 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
@@ -10376,7 +10380,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcom_err  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10379 "configure"
+#line 10383 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10395,16 +10399,16 @@ com_err ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10398: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10402: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10401: \$? = $ac_status" >&5
+  echo "$as_me:10405: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10407: \$? = $ac_status" >&5
+  echo "$as_me:10411: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_com_err_com_err=yes
 else
@@ -10415,7 +10419,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10418: result: $ac_cv_lib_com_err_com_err" >&5
+echo "$as_me:10422: 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
@@ -10426,7 +10430,7 @@ EOF
 
 fi
 
-echo "$as_me:10429: checking for mit_des_cbc_encrypt in -lk5crypto" >&5
+echo "$as_me:10433: 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
@@ -10434,7 +10438,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lk5crypto  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10437 "configure"
+#line 10441 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10453,16 +10457,16 @@ mit_des_cbc_encrypt ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10456: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10460: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10459: \$? = $ac_status" >&5
+  echo "$as_me:10463: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10466: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10465: \$? = $ac_status" >&5
+  echo "$as_me:10469: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_k5crypto_mit_des_cbc_encrypt=yes
 else
@@ -10473,7 +10477,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10476: result: $ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&5
+echo "$as_me:10480: 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
@@ -10484,7 +10488,7 @@ EOF
 
 fi
 
-echo "$as_me:10487: checking for mit_des_cbc_encrypt in -lcrypto" >&5
+echo "$as_me:10491: 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
@@ -10492,7 +10496,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10495 "configure"
+#line 10499 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10511,16 +10515,16 @@ mit_des_cbc_encrypt ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10514: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10518: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10517: \$? = $ac_status" >&5
+  echo "$as_me:10521: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10524: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10523: \$? = $ac_status" >&5
+  echo "$as_me:10527: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_crypto_mit_des_cbc_encrypt=yes
 else
@@ -10531,7 +10535,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10534: result: $ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5
+echo "$as_me:10538: 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
@@ -10542,7 +10546,7 @@ EOF
 
 fi
 
-echo "$as_me:10545: checking for krb5_init_context in -lkrb5" >&5
+echo "$as_me:10549: 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
@@ -10550,7 +10554,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkrb5  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10553 "configure"
+#line 10557 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10569,16 +10573,16 @@ krb5_init_context ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10576: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10575: \$? = $ac_status" >&5
+  echo "$as_me:10579: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10581: \$? = $ac_status" >&5
+  echo "$as_me:10585: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_krb5_krb5_init_context=yes
 else
@@ -10589,7 +10593,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10592: result: $ac_cv_lib_krb5_krb5_init_context" >&5
+echo "$as_me:10596: 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
@@ -10602,7 +10606,7 @@ fi
 
   if test "${with_kerberos5+set}" != set; then
 
-echo "$as_me:10605: checking for des_cbc_encrypt in -ldes425" >&5
+echo "$as_me:10609: 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
@@ -10610,7 +10614,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldes425  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10613 "configure"
+#line 10617 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10629,16 +10633,16 @@ des_cbc_encrypt ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10632: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10636: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10635: \$? = $ac_status" >&5
+  echo "$as_me:10639: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10641: \$? = $ac_status" >&5
+  echo "$as_me:10645: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_des425_des_cbc_encrypt=yes
 else
@@ -10649,7 +10653,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10652: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5
+echo "$as_me:10656: 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
@@ -10660,7 +10664,7 @@ EOF
 
 else
 
-echo "$as_me:10663: checking for des_cbc_encrypt in -ldes" >&5
+echo "$as_me:10667: 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
@@ -10668,7 +10672,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldes  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10671 "configure"
+#line 10675 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10687,16 +10691,16 @@ des_cbc_encrypt ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10690: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10694: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10693: \$? = $ac_status" >&5
+  echo "$as_me:10697: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10700: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10699: \$? = $ac_status" >&5
+  echo "$as_me:10703: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_des_des_cbc_encrypt=yes
 else
@@ -10707,7 +10711,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10710: result: $ac_cv_lib_des_des_cbc_encrypt" >&5
+echo "$as_me:10714: 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
@@ -10720,7 +10724,7 @@ fi
 
 fi
 
-echo "$as_me:10723: checking for krb_get_cred in -lkrb4" >&5
+echo "$as_me:10727: 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
@@ -10728,7 +10732,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkrb4  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10731 "configure"
+#line 10735 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10747,16 +10751,16 @@ krb_get_cred ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10750: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10754: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10753: \$? = $ac_status" >&5
+  echo "$as_me:10757: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10759: \$? = $ac_status" >&5
+  echo "$as_me:10763: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_krb4_krb_get_cred=yes
 else
@@ -10767,7 +10771,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10770: result: $ac_cv_lib_krb4_krb_get_cred" >&5
+echo "$as_me:10774: 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
@@ -10778,7 +10782,7 @@ EOF
 
 else
 
-echo "$as_me:10781: checking for krb_get_cred in -lkrb" >&5
+echo "$as_me:10785: 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
@@ -10786,7 +10790,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkrb  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10789 "configure"
+#line 10793 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10805,16 +10809,16 @@ krb_get_cred ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10812: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10811: \$? = $ac_status" >&5
+  echo "$as_me:10815: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10817: \$? = $ac_status" >&5
+  echo "$as_me:10821: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_krb_krb_get_cred=yes
 else
@@ -10825,7 +10829,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10828: result: $ac_cv_lib_krb_krb_get_cred" >&5
+echo "$as_me:10832: 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
@@ -10845,23 +10849,23 @@ fi
 for ac_header in krb5.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10848: checking for $ac_header" >&5
+echo "$as_me:10852: 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 10854 "configure"
+#line 10858 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10858: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10862: \"$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:10864: \$? = $ac_status" >&5
+  echo "$as_me:10868: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10880,7 +10884,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10883: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10887: 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
@@ -10895,23 +10899,23 @@ done
 for ac_header in des.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10898: checking for $ac_header" >&5
+echo "$as_me:10902: 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 10904 "configure"
+#line 10908 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10908: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10912: \"$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:10914: \$? = $ac_status" >&5
+  echo "$as_me:10918: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10930,7 +10934,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10933: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10937: 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
@@ -10942,23 +10946,23 @@ else
 for ac_header in kerberosIV/des.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10945: checking for $ac_header" >&5
+echo "$as_me:10949: 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 10951 "configure"
+#line 10955 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10955: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10959: \"$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:10961: \$? = $ac_status" >&5
+  echo "$as_me:10965: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10977,7 +10981,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10980: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10984: 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
@@ -10989,23 +10993,23 @@ else
 for ac_header in kerberos/des.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10992: checking for $ac_header" >&5
+echo "$as_me:10996: 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 10998 "configure"
+#line 11002 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11002: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11006: \"$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:11008: \$? = $ac_status" >&5
+  echo "$as_me:11012: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11024,7 +11028,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11027: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11031: 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
@@ -11043,23 +11047,23 @@ done
 for ac_header in krb.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11046: checking for $ac_header" >&5
+echo "$as_me:11050: 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 11052 "configure"
+#line 11056 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11056: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11060: \"$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:11062: \$? = $ac_status" >&5
+  echo "$as_me:11066: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11078,7 +11082,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11081: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11085: 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
@@ -11090,23 +11094,23 @@ else
 for ac_header in kerberosIV/krb.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11093: checking for $ac_header" >&5
+echo "$as_me:11097: 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 11099 "configure"
+#line 11103 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11103: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11107: \"$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:11109: \$? = $ac_status" >&5
+  echo "$as_me:11113: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11125,7 +11129,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11128: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11132: 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
@@ -11137,23 +11141,23 @@ else
 for ac_header in kerberos/krb.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11140: checking for $ac_header" >&5
+echo "$as_me:11144: 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 11146 "configure"
+#line 11150 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11150: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11154: \"$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:11156: \$? = $ac_status" >&5
+  echo "$as_me:11160: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11172,7 +11176,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11175: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11179: 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
@@ -11193,23 +11197,23 @@ done
 for ac_header in com_err.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11196: checking for $ac_header" >&5
+echo "$as_me:11200: 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 11202 "configure"
+#line 11206 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11206: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11210: \"$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:11212: \$? = $ac_status" >&5
+  echo "$as_me:11216: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11228,7 +11232,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11231: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11235: 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
@@ -11243,7 +11247,7 @@ fi
 # Solaris requires -lintl if you want strerror (which calls dgettext)
 # to return localized messages.
 
-echo "$as_me:11246: checking for dgettext in -lintl" >&5
+echo "$as_me:11250: 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
@@ -11251,7 +11255,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11254 "configure"
+#line 11258 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11270,16 +11274,16 @@ dgettext ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11273: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11277: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11276: \$? = $ac_status" >&5
+  echo "$as_me:11280: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11282: \$? = $ac_status" >&5
+  echo "$as_me:11286: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_intl_dgettext=yes
 else
@@ -11290,7 +11294,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11293: result: $ac_cv_lib_intl_dgettext" >&5
+echo "$as_me:11297: 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
@@ -11301,7 +11305,7 @@ EOF
 
 fi
 
-echo "$as_me:11304: checking whether localtime caches TZ" >&5
+echo "$as_me:11308: 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
@@ -11312,7 +11316,7 @@ if test "$cross_compiling" = yes; then
 emacs_cv_localtime_cache=yes
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11315 "configure"
+#line 11319 "configure"
 #include "confdefs.h"
 #include <time.h>
 extern char **environ;
@@ -11345,15 +11349,15 @@ main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11348: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11352: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11351: \$? = $ac_status" >&5
+  echo "$as_me:11355: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11353: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11356: \$? = $ac_status" >&5
+  echo "$as_me:11360: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_localtime_cache=no
 else
@@ -11370,7 +11374,7 @@ else
 	emacs_cv_localtime_cache=no
 fi
 fi
-echo "$as_me:11373: result: $emacs_cv_localtime_cache" >&5
+echo "$as_me:11377: result: $emacs_cv_localtime_cache" >&5
 echo "${ECHO_T}$emacs_cv_localtime_cache" >&6
 if test $emacs_cv_localtime_cache = yes; then
   cat >>confdefs.h <<\EOF
@@ -11384,13 +11388,13 @@ if test "x$HAVE_TIMEVAL" = xyes; then
 for ac_func in gettimeofday
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11387: checking for $ac_func" >&5
+echo "$as_me:11391: 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 11393 "configure"
+#line 11397 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11421,16 +11425,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11424: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11428: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11427: \$? = $ac_status" >&5
+  echo "$as_me:11431: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11433: \$? = $ac_status" >&5
+  echo "$as_me:11437: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11440,7 +11444,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11443: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11447: 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
@@ -11450,13 +11454,13 @@ EOF
 fi
 done
 
-  echo "$as_me:11453: checking whether gettimeofday can accept two arguments" >&5
+  echo "$as_me:11457: 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 11459 "configure"
+#line 11463 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -11479,16 +11483,16 @@ struct timeval time;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11482: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11486: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11485: \$? = $ac_status" >&5
+  echo "$as_me:11489: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11491: \$? = $ac_status" >&5
+  echo "$as_me:11495: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_gettimeofday_two_arguments=yes
 else
@@ -11498,7 +11502,7 @@ emacs_cv_gettimeofday_two_arguments=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11501: result: $emacs_cv_gettimeofday_two_arguments" >&5
+echo "$as_me:11505: 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
     cat >>confdefs.h <<\EOF
@@ -11509,13 +11513,13 @@ EOF
 fi
 
 if test "$ac_cv_func_gettimeofday" = yes; then
-  echo "$as_me:11512: checking for struct timezone" >&5
+  echo "$as_me:11516: 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 11518 "configure"
+#line 11522 "configure"
 #include "confdefs.h"
 #include <sys/time.h>
 int
@@ -11527,22 +11531,22 @@ struct timezone tz;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11530: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11534: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11533: \$? = $ac_status" >&5
+  echo "$as_me:11537: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11540: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11539: \$? = $ac_status" >&5
+  echo "$as_me:11543: \$? = $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 11545 "configure"
+#line 11549 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -11562,15 +11566,15 @@ main () {
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11565: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11569: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11568: \$? = $ac_status" >&5
+  echo "$as_me:11572: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11573: \$? = $ac_status" >&5
+  echo "$as_me:11577: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_struct_timezone=yes
 else
@@ -11588,18 +11592,18 @@ emacs_cv_struct_timezone=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11591: result: $emacs_cv_struct_timezone" >&5
+echo "$as_me:11595: result: $emacs_cv_struct_timezone" >&5
 echo "${ECHO_T}$emacs_cv_struct_timezone" >&6
 fi
 
 ok_so_far=yes
-echo "$as_me:11596: checking for socket" >&5
+echo "$as_me:11600: 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 11602 "configure"
+#line 11606 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket (); below.  */
@@ -11630,16 +11634,16 @@ f = socket;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11633: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11637: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11636: \$? = $ac_status" >&5
+  echo "$as_me:11640: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11643: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11642: \$? = $ac_status" >&5
+  echo "$as_me:11646: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_socket=yes
 else
@@ -11649,7 +11653,7 @@ ac_cv_func_socket=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11652: result: $ac_cv_func_socket" >&5
+echo "$as_me:11656: result: $ac_cv_func_socket" >&5
 echo "${ECHO_T}$ac_cv_func_socket" >&6
 if test $ac_cv_func_socket = yes; then
   :
@@ -11658,23 +11662,23 @@ else
 fi
 
 if test $ok_so_far = yes; then
-  echo "$as_me:11661: checking for netinet/in.h" >&5
+  echo "$as_me:11665: 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 11667 "configure"
+#line 11671 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 _ACEOF
-if { (eval echo "$as_me:11671: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11675: \"$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:11677: \$? = $ac_status" >&5
+  echo "$as_me:11681: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11693,7 +11697,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11696: result: $ac_cv_header_netinet_in_h" >&5
+echo "$as_me:11700: 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
   :
@@ -11703,23 +11707,23 @@ fi
 
 fi
 if test $ok_so_far = yes; then
-  echo "$as_me:11706: checking for arpa/inet.h" >&5
+  echo "$as_me:11710: 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 11712 "configure"
+#line 11716 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 _ACEOF
-if { (eval echo "$as_me:11716: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11720: \"$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:11722: \$? = $ac_status" >&5
+  echo "$as_me:11726: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11738,7 +11742,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11741: result: $ac_cv_header_arpa_inet_h" >&5
+echo "$as_me:11745: 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
   :
@@ -11761,27 +11765,27 @@ EOF
 
 fi
 
-echo "$as_me:11764: checking whether system supports dynamic ptys" >&5
+echo "$as_me:11768: 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:11767: result: yes" >&5
+  echo "$as_me:11771: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   cat >>confdefs.h <<\EOF
 #define HAVE_DEV_PTMX 1
 EOF
 
 else
-  echo "$as_me:11774: result: no" >&5
+  echo "$as_me:11778: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:11778: checking for pid_t" >&5
+echo "$as_me:11782: 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 11784 "configure"
+#line 11788 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11796,16 +11800,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11799: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11803: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11802: \$? = $ac_status" >&5
+  echo "$as_me:11806: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11809: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11808: \$? = $ac_status" >&5
+  echo "$as_me:11812: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -11815,7 +11819,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11818: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:11822: 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
   :
@@ -11830,23 +11834,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11833: checking for $ac_header" >&5
+echo "$as_me:11837: 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 11839 "configure"
+#line 11843 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11843: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11847: \"$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:11849: \$? = $ac_status" >&5
+  echo "$as_me:11853: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11865,7 +11869,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11868: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11872: 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
@@ -11878,13 +11882,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11881: checking for $ac_func" >&5
+echo "$as_me:11885: 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 11887 "configure"
+#line 11891 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11915,16 +11919,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11918: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11922: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11921: \$? = $ac_status" >&5
+  echo "$as_me:11925: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11927: \$? = $ac_status" >&5
+  echo "$as_me:11931: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11934,7 +11938,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11937: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11941: 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
@@ -11946,7 +11950,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:11949: checking for working fork" >&5
+  echo "$as_me:11953: 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
@@ -11969,15 +11973,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11972: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11976: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11975: \$? = $ac_status" >&5
+  echo "$as_me:11979: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11980: \$? = $ac_status" >&5
+  echo "$as_me:11984: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -11989,7 +11993,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:11992: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:11996: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -12003,12 +12007,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:12006: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:12010: 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:12011: checking for working vfork" >&5
+  echo "$as_me:12015: 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
@@ -12017,7 +12021,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12020 "configure"
+#line 12024 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -12114,15 +12118,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12117: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12121: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12120: \$? = $ac_status" >&5
+  echo "$as_me:12124: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12125: \$? = $ac_status" >&5
+  echo "$as_me:12129: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -12134,13 +12138,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:12137: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:12141: 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:12143: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:12147: 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
 
@@ -12166,13 +12170,13 @@ EOF
 fi
 
 # Fixme: This should be replaced when we have autoconf 2.14.
-echo "$as_me:12169: checking for size_t" >&5
+echo "$as_me:12173: 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 12175 "configure"
+#line 12179 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -12187,16 +12191,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12190: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12194: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12193: \$? = $ac_status" >&5
+  echo "$as_me:12197: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12199: \$? = $ac_status" >&5
+  echo "$as_me:12203: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -12206,7 +12210,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12209: result: $ac_cv_type_size_t" >&5
+echo "$as_me:12213: 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
   :
@@ -12226,7 +12230,7 @@ CPPFLAGS="$REAL_CPPFLAGS"
 version=`grep 'defconst[	 ]*emacs-version' ${srcdir}/lisp/version.el \
 	 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
 if test x"${version}" = x; then
-  { { echo "$as_me:12229: error: can't find current emacs version in \`${srcdir}/lisp/version.el'." >&5
+  { { echo "$as_me:12233: 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
@@ -12312,23 +12316,23 @@ fi
 for ac_header in nlist.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12315: checking for $ac_header" >&5
+echo "$as_me:12319: 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 12321 "configure"
+#line 12325 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12325: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12329: \"$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:12331: \$? = $ac_status" >&5
+  echo "$as_me:12335: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12347,7 +12351,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12350: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12354: 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
@@ -12407,7 +12411,7 @@ test "${exec_prefix}" != NONE &&
 ## C preprocessor.
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 12410 "configure"
+#line 12414 "configure"
 #include "confdefs.h"
 yes..yes
 _ACEOF
@@ -12500,7 +12504,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:12503: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:12507: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -12676,7 +12680,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:12679: error: ambiguous option: $1
+    { { echo "$as_me:12683: 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;}
@@ -12695,7 +12699,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:12698: error: unrecognized option: $1
+  -*) { { echo "$as_me:12702: 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;}
@@ -12751,7 +12755,7 @@ do
   "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:12754: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:12758: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -12998,7 +13002,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:13001: creating $ac_file" >&5
+    { echo "$as_me:13005: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -13016,7 +13020,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:13019: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:13023: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -13029,7 +13033,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:13032: error: cannot find input file: $f" >&5
+           { { echo "$as_me:13036: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -13090,7 +13094,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:13093: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:13097: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -13101,7 +13105,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:13104: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:13108: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -13114,7 +13118,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:13117: error: cannot find input file: $f" >&5
+           { { echo "$as_me:13121: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -13231,7 +13235,7 @@ cat >>$CONFIG_STATUS <<\EOF
   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:13234: $ac_file is unchanged" >&5
+      { echo "$as_me:13238: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \