changeset 47560:ca6ea93e02f2

Regenerated.
author Richard M. Stallman <rms@gnu.org>
date Fri, 20 Sep 2002 13:07:44 +0000
parents 894ad3892c16
children 5bb8339ffc9e
files configure
diffstat 1 files changed, 1009 insertions(+), 993 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Fri Sep 20 12:32:42 2002 +0000
+++ b/configure	Fri Sep 20 13:07:44 2002 +0000
@@ -6208,8 +6208,9 @@
 echo "$as_me:6208: result: $HAVE_XFREE386" >&5
 echo "${ECHO_T}$HAVE_XFREE386" >&6
 
-# Change CFLAGS temporarily so that C_SWITCH_X_SITE gets used
-# for the tests that follow.  We set it back to REAL_CFLAGS later on.
+# Change CFLAGS and CPPFLAGS temporarily so that C_SWITCH_X_SITE gets
+# used for the tests that follow.  We set them back to REAL_CFLAGS and
+# REAL_CPPFLAGS later on.
 
 REAL_CPPFLAGS="$CPPFLAGS"
 
@@ -6230,10 +6231,10 @@
   fi
 
   if test "${opsys}" = "gnu-linux"; then
-    echo "$as_me:6233: checking whether X on GNU/Linux needs -b to link" >&5
+    echo "$as_me:6234: 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 6236 "configure"
+#line 6237 "configure"
 #include "confdefs.h"
 
 int
@@ -6245,16 +6246,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6248: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6251: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6249: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6252: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6254: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6257: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6255: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6258: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   xlinux_first_failure=no
 else
@@ -6273,7 +6274,7 @@
       CPPFLAGS="$CPPFLAGS -b i486-linuxaout"
       LIBS="$LIBS -b i486-linuxaout"
       cat >conftest.$ac_ext <<_ACEOF
-#line 6276 "configure"
+#line 6277 "configure"
 #include "confdefs.h"
 
 int
@@ -6285,16 +6286,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6288: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6291: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6289: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6292: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6294: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6297: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6295: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6298: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   xlinux_second_failure=no
 else
@@ -6310,24 +6311,24 @@
 	C_SWITCH_X_SITE="$OLD_C_SWITCH_X_SITE"
 	CPPFLAGS="$OLD_CPPFLAGS"
 	LIBS="$OLD_LIBS"
-        echo "$as_me:6313: result: no" >&5
+        echo "$as_me:6314: result: no" >&5
 echo "${ECHO_T}no" >&6
       else
-        echo "$as_me:6316: result: yes" >&5
+        echo "$as_me:6317: result: yes" >&5
 echo "${ECHO_T}yes" >&6
       fi
     else
-      echo "$as_me:6320: result: no" >&5
+      echo "$as_me:6321: 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:6327: checking for Xkb" >&5
+  echo "$as_me:6328: checking for Xkb" >&5
 echo $ECHO_N "checking for Xkb... $ECHO_C" >&6
   cat >conftest.$ac_ext <<_ACEOF
-#line 6330 "configure"
+#line 6331 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
@@ -6340,16 +6341,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6343: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6346: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6344: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6347: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6349: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6352: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6350: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6353: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_xkb=yes
 else
@@ -6358,7 +6359,7 @@
 emacs_xkb=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  echo "$as_me:6361: result: $emacs_xkb" >&5
+  echo "$as_me:6362: result: $emacs_xkb" >&5
 echo "${ECHO_T}$emacs_xkb" >&6
   if test $emacs_xkb = yes; then
 
@@ -6372,13 +6373,13 @@
 XScreenNumberOfScreen XSetWMProtocols
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6375: checking for $ac_func" >&5
+echo "$as_me:6376: 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 6381 "configure"
+#line 6382 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6409,16 +6410,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6412: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6415: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6413: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6416: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6418: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6421: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6419: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6422: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6428,7 +6429,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6431: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6432: 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
@@ -6441,13 +6442,13 @@
 fi
 
 if test "${window_system}" = "x11"; then
-  echo "$as_me:6444: checking X11 version 6" >&5
+  echo "$as_me:6445: 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 6450 "configure"
+#line 6451 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 int
@@ -6462,16 +6463,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6465: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6468: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6466: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6469: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6471: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6474: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6472: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6475: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_x11_version_6=yes
 else
@@ -6483,7 +6484,7 @@
 fi
 
   if test $emacs_cv_x11_version_6 = yes; then
-    echo "$as_me:6486: result: 6 or newer" >&5
+    echo "$as_me:6487: result: 6 or newer" >&5
 echo "${ECHO_T}6 or newer" >&6
 
 cat >>confdefs.h <<\EOF
@@ -6491,19 +6492,19 @@
 EOF
 
   else
-    echo "$as_me:6494: result: before 6" >&5
+    echo "$as_me:6495: result: before 6" >&5
 echo "${ECHO_T}before 6" >&6
   fi
 fi
 
 if test "${window_system}" = "x11"; then
-  echo "$as_me:6500: checking X11 version 5" >&5
+  echo "$as_me:6501: 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 6506 "configure"
+#line 6507 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 int
@@ -6518,16 +6519,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6521: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6524: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6522: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6525: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6527: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6530: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6528: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6531: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_x11_version_5=yes
 else
@@ -6539,7 +6540,7 @@
 fi
 
   if test $emacs_cv_x11_version_5 = yes; then
-    echo "$as_me:6542: result: 5 or newer" >&5
+    echo "$as_me:6543: result: 5 or newer" >&5
 echo "${ECHO_T}5 or newer" >&6
     HAVE_X11R5=yes
 
@@ -6549,20 +6550,20 @@
 
   else
     HAVE_X11R5=no
-    echo "$as_me:6552: result: before 5" >&5
+    echo "$as_me:6553: 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:6559: checking X11 version 5 with Xaw" >&5
+    echo "$as_me:6560: 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 6565 "configure"
+#line 6566 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -6576,16 +6577,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6579: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6582: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6580: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6583: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6585: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6588: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6586: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6589: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_x11_version_5_with_xaw=yes
 else
@@ -6597,11 +6598,11 @@
 fi
 
     if test $emacs_cv_x11_version_5_with_xaw = yes; then
-      echo "$as_me:6600: result: 5 or newer, with Xaw; use toolkit by default" >&5
+      echo "$as_me:6601: 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:6604: result: before 5 or no Xaw; do not use toolkit by default" >&5
+      echo "$as_me:6605: 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
@@ -6613,13 +6614,13 @@
 X_TOOLKIT_TYPE=$USE_X_TOOLKIT
 
 if test "${USE_X_TOOLKIT}" != "none"; then
-  echo "$as_me:6616: checking X11 toolkit version" >&5
+  echo "$as_me:6617: 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 6622 "configure"
+#line 6623 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -6634,16 +6635,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6637: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6640: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6638: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6641: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6643: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6646: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6644: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6647: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_x11_toolkit_version_6=yes
 else
@@ -6656,7 +6657,7 @@
 
   HAVE_X11XTR6=$emacs_cv_x11_toolkit_version_6
   if test $emacs_cv_x11_toolkit_version_6 = yes; then
-    echo "$as_me:6659: result: 6 or newer" >&5
+    echo "$as_me:6660: result: 6 or newer" >&5
 echo "${ECHO_T}6 or newer" >&6
 
 cat >>confdefs.h <<\EOF
@@ -6664,7 +6665,7 @@
 EOF
 
   else
-    echo "$as_me:6667: result: before 6" >&5
+    echo "$as_me:6668: result: before 6" >&5
 echo "${ECHO_T}before 6" >&6
   fi
 
@@ -6675,7 +6676,7 @@
     LIBS="-lXt $LIBS"
   fi
 
-echo "$as_me:6678: checking for XmuConvertStandardSelection in -lXmu" >&5
+echo "$as_me:6679: 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
@@ -6683,7 +6684,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXmu  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6686 "configure"
+#line 6687 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6702,16 +6703,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6705: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6708: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6706: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6709: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6711: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6714: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6712: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6715: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xmu_XmuConvertStandardSelection=yes
 else
@@ -6722,7 +6723,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6725: result: $ac_cv_lib_Xmu_XmuConvertStandardSelection" >&5
+echo "$as_me:6726: 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
@@ -6740,7 +6741,7 @@
 if test "${HAVE_X11}" = "yes"; then
   if test "${USE_X_TOOLKIT}" != "none"; then
 
-echo "$as_me:6743: checking for XShapeQueryExtension in -lXext" >&5
+echo "$as_me:6744: 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
@@ -6748,7 +6749,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6751 "configure"
+#line 6752 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6767,16 +6768,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6770: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6773: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6771: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6774: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6776: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6779: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6777: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6780: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XShapeQueryExtension=yes
 else
@@ -6787,7 +6788,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6790: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
+echo "$as_me:6791: 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
@@ -6802,13 +6803,20 @@
 fi
 
 if test "${USE_X_TOOLKIT}" = "MOTIF"; then
-  echo "$as_me:6805: checking for LessTif where some systems put it" >&5
+  echo "$as_me:6806: checking for LessTif where some systems put it" >&5
 echo $ECHO_N "checking for LessTif where some systems put it... $ECHO_C" >&6
 if test "${emacs_cv_lesstif+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 6811 "configure"
+  # We put this in CFLAGS temporarily to precede other -I options
+  # that might be in CFLAGS temporarily.
+  # We put this in CPPFLAGS where it precedes the other -I options.
+  OLD_CPPFLAGS=$CPPFLAGS
+  OLD_CFLAGS=$CFLAGS
+  CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CPPFLAGS"
+  CFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 6819 "configure"
 #include "confdefs.h"
 #include </usr/X11R6/LessTif/Motif1.2/include/Xm/Xm.h>
 int
@@ -6820,16 +6828,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6823: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6831: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6826: \$? = $ac_status" >&5
+  echo "$as_me:6834: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6829: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6832: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6837: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6840: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_lesstif=yes
 else
@@ -6839,19 +6847,27 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6842: result: $emacs_cv_lesstif" >&5
+echo "$as_me:6850: result: $emacs_cv_lesstif" >&5
 echo "${ECHO_T}$emacs_cv_lesstif" >&6
   if test $emacs_cv_lesstif = yes; then
-    CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CPPFLAGS"
+    # Make sure this -I option remains in CPPFLAGS after it is set
+    # back to REAL_CPPFLAGS.
+    # There is no need to change REAL_CFLAGS, because REAL_CFLAGS does not
+    # have those other -I options anyway.  Ultimately, having this
+    # directory ultimately in CPPFLAGS will be enough.
+    REAL_CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $REAL_CPPFLAGS"
     LDFLAGS="-L/usr/X11R6/LessTif/Motif1.2/lib $LDFLAGS"
-  fi
-  echo "$as_me:6848: checking for Motif version 2.1" >&5
+  else
+    CFLAGS=$OLD_CFLAGS
+    CPPFLAGS=$OLD_CPPFLAGS
+  fi
+  echo "$as_me:6864: 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 6854 "configure"
+#line 6870 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 int
@@ -6867,16 +6883,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6870: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6886: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6873: \$? = $ac_status" >&5
+  echo "$as_me:6889: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6876: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6879: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6892: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6895: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_motif_version_2_1=yes
 else
@@ -6886,7 +6902,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6889: result: $emacs_cv_motif_version_2_1" >&5
+echo "$as_me:6905: 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
@@ -6896,7 +6912,7 @@
 #define HAVE_MOTIF_2_1 1
 EOF
 
-    echo "$as_me:6899: checking for XpCreateContext in -lXp" >&5
+    echo "$as_me:6915: 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
@@ -6904,7 +6920,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXp  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6907 "configure"
+#line 6923 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6923,16 +6939,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6926: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:6929: \$? = $ac_status" >&5
+if { (eval echo "$as_me:6942: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6945: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6932: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:6935: \$? = $ac_status" >&5
+  { (eval echo "$as_me:6948: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6951: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xp_XpCreateContext=yes
 else
@@ -6943,7 +6959,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6946: result: $ac_cv_lib_Xp_XpCreateContext" >&5
+echo "$as_me:6962: 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
@@ -6963,23 +6979,23 @@
 HAVE_XAW3D=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${USE_X_TOOLKIT}" != "none"; then
-    echo "$as_me:6966: checking for X11/Xaw3d/Scrollbar.h" >&5
+    echo "$as_me:6982: 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 6972 "configure"
+#line 6988 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/Scrollbar.h>
 _ACEOF
-if { (eval echo "$as_me:6976: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6992: \"$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:6982: \$? = $ac_status" >&5
+  echo "$as_me:6998: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6998,10 +7014,10 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7001: result: $ac_cv_header_X11_Xaw3d_Scrollbar_h" >&5
+echo "$as_me:7017: 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:7004: checking for XawScrollbarSetThumb in -lXaw3d" >&5
+  echo "$as_me:7020: 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
@@ -7009,7 +7025,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXaw3d  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7012 "configure"
+#line 7028 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7028,16 +7044,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7031: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7034: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7047: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7050: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7037: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7040: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7053: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7056: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xaw3d_XawScrollbarSetThumb=yes
 else
@@ -7048,7 +7064,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7051: result: $ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&5
+echo "$as_me:7067: 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
@@ -7098,23 +7114,23 @@
 HAVE_XPM=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${with_xpm}" != "no"; then
-    echo "$as_me:7101: checking for X11/xpm.h" >&5
+    echo "$as_me:7117: 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 7107 "configure"
+#line 7123 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 _ACEOF
-if { (eval echo "$as_me:7111: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7127: \"$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:7117: \$? = $ac_status" >&5
+  echo "$as_me:7133: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7133,10 +7149,10 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7136: result: $ac_cv_header_X11_xpm_h" >&5
+echo "$as_me:7152: 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:7139: checking for XpmReadFileToPixmap in -lXpm" >&5
+  echo "$as_me:7155: 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
@@ -7144,7 +7160,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm -lX11 $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7147 "configure"
+#line 7163 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7163,16 +7179,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7166: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7169: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7182: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7185: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7172: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7175: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7188: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7191: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xpm_XpmReadFileToPixmap=yes
 else
@@ -7183,7 +7199,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7186: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5
+echo "$as_me:7202: 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
@@ -7192,10 +7208,10 @@
 fi
 
     if test "${HAVE_XPM}" = "yes"; then
-      echo "$as_me:7195: checking for XpmReturnAllocPixels preprocessor define" >&5
+      echo "$as_me:7211: checking for XpmReturnAllocPixels preprocessor define" >&5
 echo $ECHO_N "checking for XpmReturnAllocPixels preprocessor define... $ECHO_C" >&6
       cat >conftest.$ac_ext <<_ACEOF
-#line 7198 "configure"
+#line 7214 "configure"
 #include "confdefs.h"
 #include "X11/xpm.h"
 #ifndef XpmReturnAllocPixels
@@ -7212,10 +7228,10 @@
 rm -f conftest*
 
       if test "${HAVE_XPM}" = "yes"; then
-	echo "$as_me:7215: result: yes" >&5
+	echo "$as_me:7231: result: yes" >&5
 echo "${ECHO_T}yes" >&6
       else
-	echo "$as_me:7218: result: no" >&5
+	echo "$as_me:7234: result: no" >&5
 echo "${ECHO_T}no" >&6
       fi
     fi
@@ -7234,23 +7250,23 @@
 HAVE_JPEG=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${with_jpeg}" != "no"; then
-            echo "$as_me:7237: checking for jerror.h" >&5
+            echo "$as_me:7253: 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 7243 "configure"
+#line 7259 "configure"
 #include "confdefs.h"
 #include <jerror.h>
 _ACEOF
-if { (eval echo "$as_me:7247: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7263: \"$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:7253: \$? = $ac_status" >&5
+  echo "$as_me:7269: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7269,10 +7285,10 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7272: result: $ac_cv_header_jerror_h" >&5
+echo "$as_me:7288: 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:7275: checking for jpeg_destroy_compress in -ljpeg" >&5
+  echo "$as_me:7291: 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
@@ -7280,7 +7296,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljpeg  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7283 "configure"
+#line 7299 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7299,16 +7315,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7302: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7305: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7318: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7321: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7308: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7311: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7324: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7327: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_jpeg_jpeg_destroy_compress=yes
 else
@@ -7319,7 +7335,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7322: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5
+echo "$as_me:7338: 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
@@ -7335,7 +7351,7 @@
 EOF
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 7338 "configure"
+#line 7354 "configure"
 #include "confdefs.h"
         #include <jpeglib.h>
 	 version=JPEG_LIB_VERSION
@@ -7348,7 +7364,7 @@
 EOF
 
 else
-  { echo "$as_me:7351: WARNING: libjpeg found, but not version 6b or later" >&5
+  { echo "$as_me:7367: WARNING: libjpeg found, but not version 6b or later" >&5
 echo "$as_me: WARNING: libjpeg found, but not version 6b or later" >&2;}
         HAVE_JPEG=no
 fi
@@ -7361,23 +7377,23 @@
 HAVE_PNG=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${with_png}" != "no"; then
-    echo "$as_me:7364: checking for png.h" >&5
+    echo "$as_me:7380: 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 7370 "configure"
+#line 7386 "configure"
 #include "confdefs.h"
 #include <png.h>
 _ACEOF
-if { (eval echo "$as_me:7374: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7390: \"$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:7380: \$? = $ac_status" >&5
+  echo "$as_me:7396: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7396,10 +7412,10 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7399: result: $ac_cv_header_png_h" >&5
+echo "$as_me:7415: 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:7402: checking for png_get_channels in -lpng" >&5
+  echo "$as_me:7418: 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
@@ -7407,7 +7423,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpng -lz -lm $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7410 "configure"
+#line 7426 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7426,16 +7442,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7429: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7432: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7445: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7448: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7435: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7438: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7451: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7454: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_png_png_get_channels=yes
 else
@@ -7446,7 +7462,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7449: result: $ac_cv_lib_png_png_get_channels" >&5
+echo "$as_me:7465: 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
@@ -7469,23 +7485,23 @@
 HAVE_TIFF=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${with_tiff}" != "no"; then
-    echo "$as_me:7472: checking for tiffio.h" >&5
+    echo "$as_me:7488: 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 7478 "configure"
+#line 7494 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 _ACEOF
-if { (eval echo "$as_me:7482: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7498: \"$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:7488: \$? = $ac_status" >&5
+  echo "$as_me:7504: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7504,13 +7520,13 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7507: result: $ac_cv_header_tiffio_h" >&5
+echo "$as_me:7523: 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:7513: checking for TIFFGetVersion in -ltiff" >&5
+      echo "$as_me:7529: 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
@@ -7518,7 +7534,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltiff $tifflibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7521 "configure"
+#line 7537 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7537,16 +7553,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7540: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7543: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7556: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7559: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7546: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7549: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7562: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7565: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_tiff_TIFFGetVersion=yes
 else
@@ -7557,7 +7573,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7560: result: $ac_cv_lib_tiff_TIFFGetVersion" >&5
+echo "$as_me:7576: 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
@@ -7580,23 +7596,23 @@
 HAVE_GIF=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${with_gif}" != "no"; then
-    echo "$as_me:7583: checking for gif_lib.h" >&5
+    echo "$as_me:7599: 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 7589 "configure"
+#line 7605 "configure"
 #include "confdefs.h"
 #include <gif_lib.h>
 _ACEOF
-if { (eval echo "$as_me:7593: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7609: \"$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:7599: \$? = $ac_status" >&5
+  echo "$as_me:7615: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7615,12 +7631,12 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7618: result: $ac_cv_header_gif_lib_h" >&5
+echo "$as_me:7634: result: $ac_cv_header_gif_lib_h" >&5
 echo "${ECHO_T}$ac_cv_header_gif_lib_h" >&6
 if test $ac_cv_header_gif_lib_h = yes; then
   # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
 # Earlier versions can crash Emacs.
-      echo "$as_me:7623: checking for EGifPutExtensionLast in -lungif" >&5
+      echo "$as_me:7639: checking for EGifPutExtensionLast in -lungif" >&5
 echo $ECHO_N "checking for EGifPutExtensionLast in -lungif... $ECHO_C" >&6
 if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7628,7 +7644,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lungif  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7631 "configure"
+#line 7647 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7647,16 +7663,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7650: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7653: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7666: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7669: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7656: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7659: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7672: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7675: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ungif_EGifPutExtensionLast=yes
 else
@@ -7667,7 +7683,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7670: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
+echo "$as_me:7686: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
 echo "${ECHO_T}$ac_cv_lib_ungif_EGifPutExtensionLast" >&6
 if test $ac_cv_lib_ungif_EGifPutExtensionLast = yes; then
   HAVE_GIF=yes
@@ -7689,23 +7705,23 @@
 ### Use Mac OS X Carbon API to implement GUI.
 HAVE_CARBON=no
 if test "${with_carbon}" != "no"; then
-  echo "$as_me:7692: checking for Carbon/Carbon.h" >&5
+  echo "$as_me:7708: checking for Carbon/Carbon.h" >&5
 echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6
 if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7698 "configure"
+#line 7714 "configure"
 #include "confdefs.h"
 #include <Carbon/Carbon.h>
 _ACEOF
-if { (eval echo "$as_me:7702: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7718: \"$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:7708: \$? = $ac_status" >&5
+  echo "$as_me:7724: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7724,7 +7740,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7727: result: $ac_cv_header_Carbon_Carbon_h" >&5
+echo "$as_me:7743: result: $ac_cv_header_Carbon_Carbon_h" >&5
 echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6
 if test $ac_cv_header_Carbon_Carbon_h = yes; then
   HAVE_CARBON=yes
@@ -7743,23 +7759,23 @@
 ### Use session management (-lSM -lICE) if available
 HAVE_X_SM=no
 if test "${HAVE_X11}" = "yes"; then
-  echo "$as_me:7746: checking for X11/SM/SMlib.h" >&5
+  echo "$as_me:7762: checking for X11/SM/SMlib.h" >&5
 echo $ECHO_N "checking for X11/SM/SMlib.h... $ECHO_C" >&6
 if test "${ac_cv_header_X11_SM_SMlib_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7752 "configure"
+#line 7768 "configure"
 #include "confdefs.h"
 #include <X11/SM/SMlib.h>
 _ACEOF
-if { (eval echo "$as_me:7756: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7772: \"$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:7762: \$? = $ac_status" >&5
+  echo "$as_me:7778: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7778,10 +7794,10 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7781: result: $ac_cv_header_X11_SM_SMlib_h" >&5
+echo "$as_me:7797: result: $ac_cv_header_X11_SM_SMlib_h" >&5
 echo "${ECHO_T}$ac_cv_header_X11_SM_SMlib_h" >&6
 if test $ac_cv_header_X11_SM_SMlib_h = yes; then
-  echo "$as_me:7784: checking for SmcOpenConnection in -lSM" >&5
+  echo "$as_me:7800: checking for SmcOpenConnection in -lSM" >&5
 echo $ECHO_N "checking for SmcOpenConnection in -lSM... $ECHO_C" >&6
 if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7789,7 +7805,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lSM  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7792 "configure"
+#line 7808 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7808,16 +7824,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7811: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7814: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7827: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7830: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7817: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7820: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7833: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7836: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_SM_SmcOpenConnection=yes
 else
@@ -7828,7 +7844,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7831: result: $ac_cv_lib_SM_SmcOpenConnection" >&5
+echo "$as_me:7847: result: $ac_cv_lib_SM_SmcOpenConnection" >&5
 echo "${ECHO_T}$ac_cv_lib_SM_SmcOpenConnection" >&6
 if test $ac_cv_lib_SM_SmcOpenConnection = yes; then
   HAVE_X_SM=yes
@@ -7852,13 +7868,13 @@
 fi
 
 # If netdb.h doesn't declare h_errno, we must declare it by hand.
-echo "$as_me:7855: checking whether netdb declares h_errno" >&5
+echo "$as_me:7871: 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 7861 "configure"
+#line 7877 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int
@@ -7870,16 +7886,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7873: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7876: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7889: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7892: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7879: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7882: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7895: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7898: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_netdb_declares_h_errno=yes
 else
@@ -7889,7 +7905,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7892: result: $emacs_cv_netdb_declares_h_errno" >&5
+echo "$as_me:7908: 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
 
@@ -7901,13 +7917,13 @@
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:7904: checking for working alloca.h" >&5
+echo "$as_me:7920: 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 7910 "configure"
+#line 7926 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -7919,16 +7935,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7922: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7925: \$? = $ac_status" >&5
+if { (eval echo "$as_me:7938: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7941: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7928: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7931: \$? = $ac_status" >&5
+  { (eval echo "$as_me:7944: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7947: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -7938,7 +7954,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7941: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:7957: 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
 
@@ -7948,13 +7964,13 @@
 
 fi
 
-echo "$as_me:7951: checking for alloca" >&5
+echo "$as_me:7967: 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 7957 "configure"
+#line 7973 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -7986,16 +8002,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7989: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:7992: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8005: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8008: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7995: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:7998: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8011: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8014: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -8005,7 +8021,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8008: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:8024: 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
@@ -8026,13 +8042,13 @@
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:8029: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:8045: 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 8035 "configure"
+#line 8051 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -8050,18 +8066,18 @@
 rm -f conftest*
 
 fi
-echo "$as_me:8053: result: $ac_cv_os_cray" >&5
+echo "$as_me:8069: 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:8058: checking for $ac_func" >&5
+echo "$as_me:8074: 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 8064 "configure"
+#line 8080 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8092,16 +8108,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8095: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8098: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8111: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8114: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8101: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8104: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8117: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8120: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8111,7 +8127,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8114: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8130: 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
 
@@ -8125,7 +8141,7 @@
   done
 fi
 
-echo "$as_me:8128: checking stack direction for C alloca" >&5
+echo "$as_me:8144: 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
@@ -8134,7 +8150,7 @@
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8137 "configure"
+#line 8153 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -8157,15 +8173,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8160: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8163: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8176: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8179: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8165: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8168: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8181: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8184: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -8177,7 +8193,7 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:8180: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:8196: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -8189,7 +8205,7 @@
 # fmod, logb, and frexp are found in -lm on most systems.
 # On HPUX 9.01, -lm does not contain logb, so check for sqrt.
 
-echo "$as_me:8192: checking for sqrt in -lm" >&5
+echo "$as_me:8208: 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
@@ -8197,7 +8213,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8200 "configure"
+#line 8216 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8216,16 +8232,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8219: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8222: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8235: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8238: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8225: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8228: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8241: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8244: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_sqrt=yes
 else
@@ -8236,7 +8252,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8239: result: $ac_cv_lib_m_sqrt" >&5
+echo "$as_me:8255: 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
@@ -8249,7 +8265,7 @@
 
 # Check for mail-locking functions in a "mail" library
 
-echo "$as_me:8252: checking for maillock in -lmail" >&5
+echo "$as_me:8268: 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
@@ -8257,7 +8273,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmail  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8260 "configure"
+#line 8276 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8276,16 +8292,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8279: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8282: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8295: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8298: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8285: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8288: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8301: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8304: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mail_maillock=yes
 else
@@ -8296,7 +8312,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8299: result: $ac_cv_lib_mail_maillock" >&5
+echo "$as_me:8315: 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
@@ -8307,7 +8323,7 @@
 
 fi
 
-echo "$as_me:8310: checking for maillock in -llockfile" >&5
+echo "$as_me:8326: 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
@@ -8315,7 +8331,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-llockfile  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8318 "configure"
+#line 8334 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8334,16 +8350,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8337: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8340: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8353: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8356: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8343: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8346: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8359: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8362: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_lockfile_maillock=yes
 else
@@ -8354,7 +8370,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8357: result: $ac_cv_lib_lockfile_maillock" >&5
+echo "$as_me:8373: 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
@@ -8371,7 +8387,7 @@
 if test "$ac_cv_lib_lockfile_maillock" = no; then
       # Extract the first word of "liblockfile.so", so it can be a program name with args.
 set dummy liblockfile.so; ac_word=$2
-echo "$as_me:8374: checking for $ac_word" >&5
+echo "$as_me:8390: 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
@@ -8386,7 +8402,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_liblockfile="yes"
-echo "$as_me:8389: found $ac_dir/$ac_word" >&5
+echo "$as_me:8405: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8395,15 +8411,15 @@
 fi
 liblockfile=$ac_cv_prog_liblockfile
 if test -n "$liblockfile"; then
-  echo "$as_me:8398: result: $liblockfile" >&5
+  echo "$as_me:8414: result: $liblockfile" >&5
 echo "${ECHO_T}$liblockfile" >&6
 else
-  echo "$as_me:8401: result: no" >&5
+  echo "$as_me:8417: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   if test $ac_cv_prog_liblockfile = yes; then
-    { { echo "$as_me:8406: error: Shared liblockfile found but can't link against it.
+    { { echo "$as_me:8422: 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.
@@ -8422,13 +8438,13 @@
 for ac_func in touchlock
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8425: checking for $ac_func" >&5
+echo "$as_me:8441: 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 8431 "configure"
+#line 8447 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8459,16 +8475,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8462: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8465: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8478: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8481: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8468: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8471: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8484: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8487: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8478,7 +8494,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8481: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8497: 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
@@ -8491,23 +8507,23 @@
 for ac_header in maillock.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8494: checking for $ac_header" >&5
+echo "$as_me:8510: 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 8500 "configure"
+#line 8516 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8504: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8520: \"$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:8510: \$? = $ac_status" >&5
+  echo "$as_me:8526: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8526,7 +8542,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8529: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8545: 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
@@ -8546,13 +8562,13 @@
 gai_strerror mkstemp getline getdelim
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8549: checking for $ac_func" >&5
+echo "$as_me:8565: 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 8555 "configure"
+#line 8571 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8583,16 +8599,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8586: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8589: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8602: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8605: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8592: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8595: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8608: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8611: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8602,7 +8618,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8605: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8621: 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
@@ -8615,23 +8631,23 @@
 for ac_header in sys/un.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8618: checking for $ac_header" >&5
+echo "$as_me:8634: 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 8624 "configure"
+#line 8640 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8628: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8644: \"$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:8634: \$? = $ac_status" >&5
+  echo "$as_me:8650: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8650,7 +8666,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8653: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8669: 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
@@ -8663,23 +8679,23 @@
 for ac_header in sys/time.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8666: checking for $ac_header" >&5
+echo "$as_me:8682: 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 8672 "configure"
+#line 8688 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8676: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8692: \"$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:8682: \$? = $ac_status" >&5
+  echo "$as_me:8698: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8698,7 +8714,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8701: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8717: 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
@@ -8711,13 +8727,13 @@
 for ac_func in alarm
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8714: checking for $ac_func" >&5
+echo "$as_me:8730: 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 8720 "configure"
+#line 8736 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8748,16 +8764,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8751: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8754: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8767: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8770: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8757: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8760: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8773: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8776: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8767,7 +8783,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8770: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8786: 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
@@ -8777,7 +8793,7 @@
 fi
 done
 
-echo "$as_me:8780: checking for working mktime" >&5
+echo "$as_me:8796: 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
@@ -8786,7 +8802,7 @@
   ac_cv_func_working_mktime=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8789 "configure"
+#line 8805 "configure"
 #include "confdefs.h"
 /* Test program from Paul Eggert and Tony Leneis.  */
 #if TIME_WITH_SYS_TIME
@@ -8935,15 +8951,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8938: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8941: \$? = $ac_status" >&5
+if { (eval echo "$as_me:8954: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8957: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8943: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8946: \$? = $ac_status" >&5
+  { (eval echo "$as_me:8959: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8962: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_working_mktime=yes
 else
@@ -8955,7 +8971,7 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:8958: result: $ac_cv_func_working_mktime" >&5
+echo "$as_me:8974: 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"
@@ -8974,13 +8990,13 @@
 ac_save_LIBS=$LIBS
 
 # Check for getloadavg, but be sure not to touch the cache variable.
-(echo "$as_me:8977: checking for getloadavg" >&5
+(echo "$as_me:8993: 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 8983 "configure"
+#line 8999 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getloadavg (); below.  */
@@ -9011,16 +9027,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9014: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9017: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9030: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9033: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9020: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9023: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9036: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9039: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getloadavg=yes
 else
@@ -9030,7 +9046,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9033: result: $ac_cv_func_getloadavg" >&5
+echo "$as_me:9049: result: $ac_cv_func_getloadavg" >&5
 echo "${ECHO_T}$ac_cv_func_getloadavg" >&6
 if test $ac_cv_func_getloadavg = yes; then
   exit 0
@@ -9044,13 +9060,13 @@
 for ac_func in pstat_getdynamic
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9047: checking for $ac_func" >&5
+echo "$as_me:9063: 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 9053 "configure"
+#line 9069 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9081,16 +9097,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9084: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9087: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9100: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9103: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9090: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9093: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9106: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9109: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9100,7 +9116,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9103: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9119: 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
@@ -9112,7 +9128,7 @@
 
 # Solaris has libkstat which does not require root.
 
-echo "$as_me:9115: checking for kstat_open in -lkstat" >&5
+echo "$as_me:9131: 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
@@ -9120,7 +9136,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkstat  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9123 "configure"
+#line 9139 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9139,16 +9155,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9142: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9145: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9158: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9161: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9148: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9151: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9164: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9167: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_kstat_kstat_open=yes
 else
@@ -9159,7 +9175,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9162: result: $ac_cv_lib_kstat_kstat_open" >&5
+echo "$as_me:9178: 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
@@ -9177,7 +9193,7 @@
 # to get the right answer into the cache.
 # For kstat on solaris, we need libelf to force the definition of SVR4 below.
 if test $ac_have_func = no; then
-  echo "$as_me:9180: checking for elf_begin in -lelf" >&5
+  echo "$as_me:9196: 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
@@ -9185,7 +9201,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lelf  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9188 "configure"
+#line 9204 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9204,16 +9220,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9207: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9210: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9223: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9226: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9213: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9216: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9229: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9232: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_elf_elf_begin=yes
 else
@@ -9224,7 +9240,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9227: result: $ac_cv_lib_elf_elf_begin" >&5
+echo "$as_me:9243: 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"
@@ -9232,7 +9248,7 @@
 
 fi
 if test $ac_have_func = no; then
-  echo "$as_me:9235: checking for kvm_open in -lkvm" >&5
+  echo "$as_me:9251: 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
@@ -9240,7 +9256,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkvm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9243 "configure"
+#line 9259 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9259,16 +9275,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9262: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9265: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9278: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9281: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9268: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9271: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9284: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9287: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_kvm_kvm_open=yes
 else
@@ -9279,14 +9295,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9282: result: $ac_cv_lib_kvm_kvm_open" >&5
+echo "$as_me:9298: 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:9289: checking for getloadavg in -lutil" >&5
+  echo "$as_me:9305: 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
@@ -9294,7 +9310,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9297 "configure"
+#line 9313 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9313,16 +9329,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9316: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9319: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9332: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9335: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9322: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9325: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9338: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9341: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_util_getloadavg=yes
 else
@@ -9333,7 +9349,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9336: result: $ac_cv_lib_util_getloadavg" >&5
+echo "$as_me:9352: 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
@@ -9346,7 +9362,7 @@
   # Since it is not a standard part of AIX, it might be installed locally.
   ac_getloadavg_LIBS=$LIBS
   LIBS="-L/usr/local/lib $LIBS"
-  echo "$as_me:9349: checking for getloadavg in -lgetloadavg" >&5
+  echo "$as_me:9365: 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
@@ -9354,7 +9370,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgetloadavg  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9357 "configure"
+#line 9373 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9373,16 +9389,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9376: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9379: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9392: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9395: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9382: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9385: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9398: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9401: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_getloadavg_getloadavg=yes
 else
@@ -9393,7 +9409,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9396: result: $ac_cv_lib_getloadavg_getloadavg" >&5
+echo "$as_me:9412: 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"
@@ -9409,13 +9425,13 @@
 for ac_func in getloadavg
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9412: checking for $ac_func" >&5
+echo "$as_me:9428: 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 9418 "configure"
+#line 9434 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9446,16 +9462,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9449: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9452: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9465: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9468: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9455: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9458: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9471: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9474: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9465,7 +9481,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9468: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9484: 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
@@ -9481,23 +9497,23 @@
 
 # Figure out what our getloadavg.c needs.
 ac_have_func=no
-echo "$as_me:9484: checking for sys/dg_sys_info.h" >&5
+echo "$as_me:9500: 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 9490 "configure"
+#line 9506 "configure"
 #include "confdefs.h"
 #include <sys/dg_sys_info.h>
 _ACEOF
-if { (eval echo "$as_me:9494: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9510: \"$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:9500: \$? = $ac_status" >&5
+  echo "$as_me:9516: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9516,7 +9532,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9519: result: $ac_cv_header_sys_dg_sys_info_h" >&5
+echo "$as_me:9535: 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
@@ -9525,7 +9541,7 @@
 #define DGUX 1
 EOF
 
-echo "$as_me:9528: checking for dg_sys_info in -ldgc" >&5
+echo "$as_me:9544: 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
@@ -9533,7 +9549,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldgc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9536 "configure"
+#line 9552 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9552,16 +9568,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9555: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9558: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9571: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9574: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9561: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9564: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9577: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9580: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dgc_dg_sys_info=yes
 else
@@ -9572,7 +9588,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9575: result: $ac_cv_lib_dgc_dg_sys_info" >&5
+echo "$as_me:9591: 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
@@ -9585,23 +9601,23 @@
 
 fi
 
-echo "$as_me:9588: checking for locale.h" >&5
+echo "$as_me:9604: 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 9594 "configure"
+#line 9610 "configure"
 #include "confdefs.h"
 #include <locale.h>
 _ACEOF
-if { (eval echo "$as_me:9598: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9614: \"$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:9604: \$? = $ac_status" >&5
+  echo "$as_me:9620: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9620,19 +9636,19 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9623: result: $ac_cv_header_locale_h" >&5
+echo "$as_me:9639: 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:9629: checking for $ac_func" >&5
+echo "$as_me:9645: 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 9635 "configure"
+#line 9651 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9663,16 +9679,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9666: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9669: \$? = $ac_status" >&5
+if { (eval echo "$as_me:9682: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9685: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9672: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9675: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9688: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9691: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9682,7 +9698,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9685: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9701: 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
@@ -9705,23 +9721,23 @@
 fi
 
 if test $ac_have_func = no; then
-  echo "$as_me:9708: checking for inq_stats/cpustats.h" >&5
+  echo "$as_me:9724: 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 9714 "configure"
+#line 9730 "configure"
 #include "confdefs.h"
 #include <inq_stats/cpustats.h>
 _ACEOF
-if { (eval echo "$as_me:9718: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9734: \"$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:9724: \$? = $ac_status" >&5
+  echo "$as_me:9740: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9740,7 +9756,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9743: result: $ac_cv_header_inq_stats_cpustats_h" >&5
+echo "$as_me:9759: 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
@@ -9758,23 +9774,23 @@
 fi
 
 if test $ac_have_func = no; then
-  echo "$as_me:9761: checking for sys/cpustats.h" >&5
+  echo "$as_me:9777: 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 9767 "configure"
+#line 9783 "configure"
 #include "confdefs.h"
 #include <sys/cpustats.h>
 _ACEOF
-if { (eval echo "$as_me:9771: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9787: \"$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:9777: \$? = $ac_status" >&5
+  echo "$as_me:9793: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9793,7 +9809,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9796: result: $ac_cv_header_sys_cpustats_h" >&5
+echo "$as_me:9812: 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
@@ -9809,23 +9825,23 @@
 for ac_header in mach/mach.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9812: checking for $ac_header" >&5
+echo "$as_me:9828: 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 9818 "configure"
+#line 9834 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9822: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9838: \"$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:9828: \$? = $ac_status" >&5
+  echo "$as_me:9844: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9844,7 +9860,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9847: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9863: 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
@@ -9859,23 +9875,23 @@
 for ac_header in nlist.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9862: checking for $ac_header" >&5
+echo "$as_me:9878: 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 9868 "configure"
+#line 9884 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9872: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9888: \"$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:9878: \$? = $ac_status" >&5
+  echo "$as_me:9894: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9894,19 +9910,19 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9897: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9913: 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:9903: checking for struct nlist.n_un.n_name" >&5
+ echo "$as_me:9919: 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 9909 "configure"
+#line 9925 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 
@@ -9921,16 +9937,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9924: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9940: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9927: \$? = $ac_status" >&5
+  echo "$as_me:9943: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9930: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9933: \$? = $ac_status" >&5
+  { (eval echo "$as_me:9946: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9949: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_nlist_n_un_n_name=yes
 else
@@ -9940,7 +9956,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9943: result: $ac_cv_member_struct_nlist_n_un_n_name" >&5
+echo "$as_me:9959: 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
 
@@ -9961,13 +9977,13 @@
 done
 
 # Some definitions of getloadavg require that the program be installed setgid.
-echo "$as_me:9964: checking whether getloadavg requires setgid" >&5
+echo "$as_me:9980: 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 9970 "configure"
+#line 9986 "configure"
 #include "confdefs.h"
 #include "$srcdir/getloadavg.c"
 #ifdef LDAV_PRIVILEGED
@@ -9983,7 +9999,7 @@
 rm -f conftest*
 
 fi
-echo "$as_me:9986: result: $ac_cv_func_getloadavg_setgid" >&5
+echo "$as_me:10002: 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
@@ -9997,7 +10013,7 @@
 fi
 
 if test $ac_cv_func_getloadavg_setgid = yes; then
-  echo "$as_me:10000: checking group of /dev/kmem" >&5
+  echo "$as_me:10016: 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
@@ -10012,7 +10028,7 @@
 	       / /s/.* //;p;'`
 
 fi
-echo "$as_me:10015: result: $ac_cv_group_kmem" >&5
+echo "$as_me:10031: result: $ac_cv_group_kmem" >&5
 echo "${ECHO_T}$ac_cv_group_kmem" >&6
   KMEM_GROUP=$ac_cv_group_kmem
 fi
@@ -10023,7 +10039,7 @@
 fi
 LIBS=$ac_save_LIBS
 
-echo "$as_me:10026: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "$as_me:10042: 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
@@ -10031,7 +10047,7 @@
   while :; do
   ac_cv_sys_largefile_source=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 10034 "configure"
+#line 10050 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10043,16 +10059,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10046: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10062: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10049: \$? = $ac_status" >&5
+  echo "$as_me:10065: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10052: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10055: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10068: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10071: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -10061,7 +10077,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 10064 "configure"
+#line 10080 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -10074,16 +10090,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10077: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10093: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10080: \$? = $ac_status" >&5
+  echo "$as_me:10096: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10083: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10086: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10099: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10102: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -10094,7 +10110,7 @@
   break
 done
 fi
-echo "$as_me:10097: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:10113: 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
 
@@ -10108,13 +10124,13 @@
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:10111: checking for fseeko" >&5
+echo "$as_me:10127: 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 10117 "configure"
+#line 10133 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10126,16 +10142,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10129: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10132: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10145: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10148: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10135: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10138: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10151: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10154: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -10145,7 +10161,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10148: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:10164: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -10160,13 +10176,13 @@
 for ac_func in grantpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10163: checking for $ac_func" >&5
+echo "$as_me:10179: 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 10169 "configure"
+#line 10185 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10197,16 +10213,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10200: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10203: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10216: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10219: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10206: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10209: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10222: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10225: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10216,7 +10232,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10219: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10235: 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
@@ -10231,13 +10247,13 @@
 for ac_func in getpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10234: checking for $ac_func" >&5
+echo "$as_me:10250: 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 10240 "configure"
+#line 10256 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10268,16 +10284,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10271: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10274: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10287: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10290: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10277: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10280: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10293: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10296: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10287,7 +10303,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10290: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10306: 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
@@ -10302,7 +10318,7 @@
 # It's better to believe a function is not available
 # than to expect to find it in ncurses.
 
-echo "$as_me:10305: checking for tparm in -lncurses" >&5
+echo "$as_me:10321: 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
@@ -10310,7 +10326,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10313 "configure"
+#line 10329 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10329,16 +10345,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10332: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10335: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10348: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10351: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10338: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10341: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10354: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10357: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ncurses_tparm=yes
 else
@@ -10349,7 +10365,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10352: result: $ac_cv_lib_ncurses_tparm" >&5
+echo "$as_me:10368: 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
@@ -10364,13 +10380,13 @@
 if test "$with_hesiod" = yes ; then
   # Don't set $LIBS here -- see comments above.
   resolv=no
-  echo "$as_me:10367: checking for res_send" >&5
+  echo "$as_me:10383: 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 10373 "configure"
+#line 10389 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char res_send (); below.  */
@@ -10401,16 +10417,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10404: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10407: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10420: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10423: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10410: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10413: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10426: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10429: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_res_send=yes
 else
@@ -10420,18 +10436,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10423: result: $ac_cv_func_res_send" >&5
+echo "$as_me:10439: 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:10428: checking for __res_send" >&5
+  echo "$as_me:10444: 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 10434 "configure"
+#line 10450 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char __res_send (); below.  */
@@ -10462,16 +10478,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10465: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10468: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10481: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10484: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10471: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10474: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10487: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10490: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func___res_send=yes
 else
@@ -10481,12 +10497,12 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10484: result: $ac_cv_func___res_send" >&5
+echo "$as_me:10500: 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:10489: checking for res_send in -lresolv" >&5
+  echo "$as_me:10505: 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
@@ -10494,7 +10510,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10497 "configure"
+#line 10513 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10513,16 +10529,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10516: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10519: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10532: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10535: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10522: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10525: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10538: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10541: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv_res_send=yes
 else
@@ -10533,12 +10549,12 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10536: result: $ac_cv_lib_resolv_res_send" >&5
+echo "$as_me:10552: 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:10541: checking for __res_send in -lresolv" >&5
+  echo "$as_me:10557: 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
@@ -10546,7 +10562,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10549 "configure"
+#line 10565 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10565,16 +10581,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10568: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10571: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10584: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10587: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10574: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10577: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10590: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10593: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv___res_send=yes
 else
@@ -10585,7 +10601,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10588: result: $ac_cv_lib_resolv___res_send" >&5
+echo "$as_me:10604: 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
@@ -10607,13 +10623,13 @@
   else
     RESOLVLIB=
   fi
-  echo "$as_me:10610: checking for hes_getmailhost" >&5
+  echo "$as_me:10626: 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 10616 "configure"
+#line 10632 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char hes_getmailhost (); below.  */
@@ -10644,16 +10660,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10647: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10650: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10663: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10666: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10653: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10656: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10669: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10672: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_hes_getmailhost=yes
 else
@@ -10663,12 +10679,12 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10666: result: $ac_cv_func_hes_getmailhost" >&5
+echo "$as_me:10682: 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:10671: checking for hes_getmailhost in -lhesiod" >&5
+  echo "$as_me:10687: 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
@@ -10676,7 +10692,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhesiod $RESOLVLIB $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10679 "configure"
+#line 10695 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10695,16 +10711,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10698: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10701: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10714: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10717: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10704: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10707: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10720: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10723: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_hesiod_hes_getmailhost=yes
 else
@@ -10715,7 +10731,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10718: result: $ac_cv_lib_hesiod_hes_getmailhost" >&5
+echo "$as_me:10734: 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
 
@@ -10734,7 +10750,7 @@
 # These tell us which Kerberos-related libraries to use.
 if test "${with_kerberos+set}" = set; then
 
-echo "$as_me:10737: checking for com_err in -lcom_err" >&5
+echo "$as_me:10753: 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
@@ -10742,7 +10758,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcom_err  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10745 "configure"
+#line 10761 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10761,16 +10777,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10764: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10767: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10780: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10783: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10770: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10773: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10786: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10789: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_com_err_com_err=yes
 else
@@ -10781,7 +10797,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10784: result: $ac_cv_lib_com_err_com_err" >&5
+echo "$as_me:10800: 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
@@ -10792,7 +10808,7 @@
 
 fi
 
-echo "$as_me:10795: checking for mit_des_cbc_encrypt in -lk5crypto" >&5
+echo "$as_me:10811: 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
@@ -10800,7 +10816,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lk5crypto  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10803 "configure"
+#line 10819 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10819,16 +10835,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10822: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10825: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10838: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10841: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10828: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10831: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10844: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10847: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_k5crypto_mit_des_cbc_encrypt=yes
 else
@@ -10839,7 +10855,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10842: result: $ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&5
+echo "$as_me:10858: 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
@@ -10850,7 +10866,7 @@
 
 fi
 
-echo "$as_me:10853: checking for mit_des_cbc_encrypt in -lcrypto" >&5
+echo "$as_me:10869: 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
@@ -10858,7 +10874,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10861 "configure"
+#line 10877 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10877,16 +10893,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10880: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10883: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10896: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10899: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10886: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10889: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10902: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10905: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_crypto_mit_des_cbc_encrypt=yes
 else
@@ -10897,7 +10913,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10900: result: $ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5
+echo "$as_me:10916: 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
@@ -10908,7 +10924,7 @@
 
 fi
 
-echo "$as_me:10911: checking for krb5_init_context in -lkrb5" >&5
+echo "$as_me:10927: 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
@@ -10916,7 +10932,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkrb5  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10919 "configure"
+#line 10935 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10935,16 +10951,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10938: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10941: \$? = $ac_status" >&5
+if { (eval echo "$as_me:10954: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10957: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10944: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10947: \$? = $ac_status" >&5
+  { (eval echo "$as_me:10960: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10963: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_krb5_krb5_init_context=yes
 else
@@ -10955,7 +10971,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10958: result: $ac_cv_lib_krb5_krb5_init_context" >&5
+echo "$as_me:10974: 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
@@ -10968,7 +10984,7 @@
 
   if test "${with_kerberos5+set}" != set; then
 
-echo "$as_me:10971: checking for des_cbc_encrypt in -ldes425" >&5
+echo "$as_me:10987: 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
@@ -10976,7 +10992,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldes425  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10979 "configure"
+#line 10995 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10995,16 +11011,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10998: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11001: \$? = $ac_status" >&5
+if { (eval echo "$as_me:11014: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11017: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11004: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11007: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11020: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11023: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_des425_des_cbc_encrypt=yes
 else
@@ -11015,7 +11031,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11018: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5
+echo "$as_me:11034: 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
@@ -11026,7 +11042,7 @@
 
 else
 
-echo "$as_me:11029: checking for des_cbc_encrypt in -ldes" >&5
+echo "$as_me:11045: 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
@@ -11034,7 +11050,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldes  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11037 "configure"
+#line 11053 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11053,16 +11069,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11056: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11059: \$? = $ac_status" >&5
+if { (eval echo "$as_me:11072: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11075: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11062: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11065: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11078: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11081: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_des_des_cbc_encrypt=yes
 else
@@ -11073,7 +11089,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11076: result: $ac_cv_lib_des_des_cbc_encrypt" >&5
+echo "$as_me:11092: 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
@@ -11086,7 +11102,7 @@
 
 fi
 
-echo "$as_me:11089: checking for krb_get_cred in -lkrb4" >&5
+echo "$as_me:11105: 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
@@ -11094,7 +11110,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkrb4  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11097 "configure"
+#line 11113 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11113,16 +11129,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11116: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11119: \$? = $ac_status" >&5
+if { (eval echo "$as_me:11132: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11135: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11122: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11125: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11138: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11141: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_krb4_krb_get_cred=yes
 else
@@ -11133,7 +11149,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11136: result: $ac_cv_lib_krb4_krb_get_cred" >&5
+echo "$as_me:11152: 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
@@ -11144,7 +11160,7 @@
 
 else
 
-echo "$as_me:11147: checking for krb_get_cred in -lkrb" >&5
+echo "$as_me:11163: 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
@@ -11152,7 +11168,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkrb  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11155 "configure"
+#line 11171 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11171,16 +11187,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11174: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11177: \$? = $ac_status" >&5
+if { (eval echo "$as_me:11190: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11193: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11180: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11183: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11196: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11199: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_krb_krb_get_cred=yes
 else
@@ -11191,7 +11207,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11194: result: $ac_cv_lib_krb_krb_get_cred" >&5
+echo "$as_me:11210: 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
@@ -11211,23 +11227,23 @@
 for ac_header in krb5.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11214: checking for $ac_header" >&5
+echo "$as_me:11230: 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 11220 "configure"
+#line 11236 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11224: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11240: \"$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:11230: \$? = $ac_status" >&5
+  echo "$as_me:11246: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11246,7 +11262,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11249: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11265: 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
@@ -11261,23 +11277,23 @@
 for ac_header in des.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11264: checking for $ac_header" >&5
+echo "$as_me:11280: 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 11270 "configure"
+#line 11286 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11274: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11290: \"$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:11280: \$? = $ac_status" >&5
+  echo "$as_me:11296: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11296,7 +11312,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11299: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11315: 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
@@ -11308,23 +11324,23 @@
 for ac_header in kerberosIV/des.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11311: checking for $ac_header" >&5
+echo "$as_me:11327: 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 11317 "configure"
+#line 11333 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11321: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11337: \"$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:11327: \$? = $ac_status" >&5
+  echo "$as_me:11343: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11343,7 +11359,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11346: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11362: 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
@@ -11355,23 +11371,23 @@
 for ac_header in kerberos/des.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11358: checking for $ac_header" >&5
+echo "$as_me:11374: 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 11364 "configure"
+#line 11380 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11368: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11384: \"$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:11374: \$? = $ac_status" >&5
+  echo "$as_me:11390: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11390,7 +11406,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11393: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11409: 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
@@ -11409,23 +11425,23 @@
 for ac_header in krb.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11412: checking for $ac_header" >&5
+echo "$as_me:11428: 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 11418 "configure"
+#line 11434 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11422: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11438: \"$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:11428: \$? = $ac_status" >&5
+  echo "$as_me:11444: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11444,7 +11460,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11447: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11463: 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
@@ -11456,23 +11472,23 @@
 for ac_header in kerberosIV/krb.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11459: checking for $ac_header" >&5
+echo "$as_me:11475: 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 11465 "configure"
+#line 11481 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11469: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11485: \"$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:11475: \$? = $ac_status" >&5
+  echo "$as_me:11491: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11491,7 +11507,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11494: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11510: 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
@@ -11503,23 +11519,23 @@
 for ac_header in kerberos/krb.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11506: checking for $ac_header" >&5
+echo "$as_me:11522: 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 11512 "configure"
+#line 11528 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11516: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11532: \"$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:11522: \$? = $ac_status" >&5
+  echo "$as_me:11538: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11538,7 +11554,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11541: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11557: 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
@@ -11559,23 +11575,23 @@
 for ac_header in com_err.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11562: checking for $ac_header" >&5
+echo "$as_me:11578: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11568 "configure"
+#line 11584 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11572: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11588: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:11578: \$? = $ac_status" >&5
+  echo "$as_me:11594: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11594,7 +11610,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11597: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11613: 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
@@ -11609,7 +11625,7 @@
 # Solaris requires -lintl if you want strerror (which calls dgettext)
 # to return localized messages.
 
-echo "$as_me:11612: checking for dgettext in -lintl" >&5
+echo "$as_me:11628: 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
@@ -11617,7 +11633,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11620 "configure"
+#line 11636 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11636,16 +11652,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11639: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11642: \$? = $ac_status" >&5
+if { (eval echo "$as_me:11655: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11658: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11645: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11648: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11661: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11664: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_intl_dgettext=yes
 else
@@ -11656,7 +11672,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11659: result: $ac_cv_lib_intl_dgettext" >&5
+echo "$as_me:11675: 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
@@ -11667,7 +11683,7 @@
 
 fi
 
-echo "$as_me:11670: checking whether localtime caches TZ" >&5
+echo "$as_me:11686: 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
@@ -11678,7 +11694,7 @@
 emacs_cv_localtime_cache=yes
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11681 "configure"
+#line 11697 "configure"
 #include "confdefs.h"
 #include <time.h>
 extern char **environ;
@@ -11711,15 +11727,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11714: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11717: \$? = $ac_status" >&5
+if { (eval echo "$as_me:11730: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11733: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11719: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11722: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11735: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11738: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_localtime_cache=no
 else
@@ -11736,7 +11752,7 @@
 	emacs_cv_localtime_cache=no
 fi
 fi
-echo "$as_me:11739: result: $emacs_cv_localtime_cache" >&5
+echo "$as_me:11755: result: $emacs_cv_localtime_cache" >&5
 echo "${ECHO_T}$emacs_cv_localtime_cache" >&6
 if test $emacs_cv_localtime_cache = yes; then
 
@@ -11751,13 +11767,13 @@
 for ac_func in gettimeofday
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11754: checking for $ac_func" >&5
+echo "$as_me:11770: 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 11760 "configure"
+#line 11776 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11788,16 +11804,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11791: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11794: \$? = $ac_status" >&5
+if { (eval echo "$as_me:11807: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11810: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11797: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11800: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11813: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11816: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11807,7 +11823,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11810: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11826: 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
@@ -11818,13 +11834,13 @@
 done
 
   if test $ac_cv_func_gettimeofday = yes; then
-    echo "$as_me:11821: checking whether gettimeofday can accept two arguments" >&5
+    echo "$as_me:11837: 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 11827 "configure"
+#line 11843 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -11847,16 +11863,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11850: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11866: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11853: \$? = $ac_status" >&5
+  echo "$as_me:11869: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11856: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11859: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11872: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11875: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_gettimeofday_two_arguments=yes
 else
@@ -11866,7 +11882,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11869: result: $emacs_cv_gettimeofday_two_arguments" >&5
+echo "$as_me:11885: 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
 
@@ -11879,13 +11895,13 @@
 fi
 
 if test "$ac_cv_func_gettimeofday" = yes; then
-  echo "$as_me:11882: checking for struct timezone" >&5
+  echo "$as_me:11898: 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 11888 "configure"
+#line 11904 "configure"
 #include "confdefs.h"
 #include <sys/time.h>
 int
@@ -11897,22 +11913,22 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11900: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11916: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11903: \$? = $ac_status" >&5
+  echo "$as_me:11919: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11906: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11909: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11922: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11925: \$? = $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 11915 "configure"
+#line 11931 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -11932,15 +11948,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11935: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11938: \$? = $ac_status" >&5
+if { (eval echo "$as_me:11951: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11954: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11940: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11943: \$? = $ac_status" >&5
+  { (eval echo "$as_me:11956: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11959: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   emacs_cv_struct_timezone=yes
 else
@@ -11958,18 +11974,18 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11961: result: $emacs_cv_struct_timezone" >&5
+echo "$as_me:11977: result: $emacs_cv_struct_timezone" >&5
 echo "${ECHO_T}$emacs_cv_struct_timezone" >&6
 fi
 
 ok_so_far=yes
-echo "$as_me:11966: checking for socket" >&5
+echo "$as_me:11982: 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 11972 "configure"
+#line 11988 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket (); below.  */
@@ -12000,16 +12016,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12003: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:12006: \$? = $ac_status" >&5
+if { (eval echo "$as_me:12019: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12022: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12009: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12012: \$? = $ac_status" >&5
+  { (eval echo "$as_me:12025: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12028: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_socket=yes
 else
@@ -12019,7 +12035,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12022: result: $ac_cv_func_socket" >&5
+echo "$as_me:12038: result: $ac_cv_func_socket" >&5
 echo "${ECHO_T}$ac_cv_func_socket" >&6
 if test $ac_cv_func_socket = yes; then
   :
@@ -12028,23 +12044,23 @@
 fi
 
 if test $ok_so_far = yes; then
-  echo "$as_me:12031: checking for netinet/in.h" >&5
+  echo "$as_me:12047: 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 12037 "configure"
+#line 12053 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 _ACEOF
-if { (eval echo "$as_me:12041: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12057: \"$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:12047: \$? = $ac_status" >&5
+  echo "$as_me:12063: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12063,7 +12079,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12066: result: $ac_cv_header_netinet_in_h" >&5
+echo "$as_me:12082: 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
   :
@@ -12073,23 +12089,23 @@
 
 fi
 if test $ok_so_far = yes; then
-  echo "$as_me:12076: checking for arpa/inet.h" >&5
+  echo "$as_me:12092: 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 12082 "configure"
+#line 12098 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 _ACEOF
-if { (eval echo "$as_me:12086: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12102: \"$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:12092: \$? = $ac_status" >&5
+  echo "$as_me:12108: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12108,7 +12124,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12111: result: $ac_cv_header_arpa_inet_h" >&5
+echo "$as_me:12127: 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
   :
@@ -12133,10 +12149,10 @@
 
 fi
 
-echo "$as_me:12136: checking whether system supports dynamic ptys" >&5
+echo "$as_me:12152: 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:12139: result: yes" >&5
+  echo "$as_me:12155: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -12144,17 +12160,17 @@
 EOF
 
 else
-  echo "$as_me:12147: result: no" >&5
+  echo "$as_me:12163: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12151: checking for pid_t" >&5
+echo "$as_me:12167: 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 12157 "configure"
+#line 12173 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -12169,16 +12185,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12172: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12188: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12175: \$? = $ac_status" >&5
+  echo "$as_me:12191: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12178: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12181: \$? = $ac_status" >&5
+  { (eval echo "$as_me:12194: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12197: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -12188,7 +12204,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12191: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:12207: 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
   :
@@ -12203,23 +12219,23 @@
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12206: checking for $ac_header" >&5
+echo "$as_me:12222: 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 12212 "configure"
+#line 12228 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12216: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12232: \"$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:12222: \$? = $ac_status" >&5
+  echo "$as_me:12238: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12238,7 +12254,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12241: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12257: 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
@@ -12251,13 +12267,13 @@
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12254: checking for $ac_func" >&5
+echo "$as_me:12270: 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 12260 "configure"
+#line 12276 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12288,16 +12304,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12291: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:12294: \$? = $ac_status" >&5
+if { (eval echo "$as_me:12307: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12310: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12297: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12300: \$? = $ac_status" >&5
+  { (eval echo "$as_me:12313: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12316: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12307,7 +12323,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12310: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12326: 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
@@ -12319,7 +12335,7 @@
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:12322: checking for working fork" >&5
+  echo "$as_me:12338: 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
@@ -12342,15 +12358,15 @@
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12345: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:12348: \$? = $ac_status" >&5
+if { (eval echo "$as_me:12361: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12364: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12350: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12353: \$? = $ac_status" >&5
+  { (eval echo "$as_me:12366: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12369: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -12362,7 +12378,7 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:12365: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:12381: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -12376,12 +12392,12 @@
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:12379: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:12395: 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:12384: checking for working vfork" >&5
+  echo "$as_me:12400: 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
@@ -12390,7 +12406,7 @@
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12393 "configure"
+#line 12409 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -12487,15 +12503,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12490: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:12493: \$? = $ac_status" >&5
+if { (eval echo "$as_me:12506: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12509: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12495: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12498: \$? = $ac_status" >&5
+  { (eval echo "$as_me:12511: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12514: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -12507,13 +12523,13 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:12510: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:12526: 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:12516: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:12532: 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
 
@@ -12539,13 +12555,13 @@
 fi
 
 # Fixme: This should be replaced when we have autoconf 2.14.
-echo "$as_me:12542: checking for size_t" >&5
+echo "$as_me:12558: 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 12548 "configure"
+#line 12564 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -12560,16 +12576,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12563: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12579: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12566: \$? = $ac_status" >&5
+  echo "$as_me:12582: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12569: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12572: \$? = $ac_status" >&5
+  { (eval echo "$as_me:12585: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12588: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -12579,7 +12595,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12582: result: $ac_cv_type_size_t" >&5
+echo "$as_me:12598: 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
   :
@@ -12599,7 +12615,7 @@
 version=`grep 'defconst[	 ]*emacs-version' ${srcdir}/lisp/version.el \
 	 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
 if test x"${version}" = x; then
-  { { echo "$as_me:12602: error: can't find current emacs version in \`${srcdir}/lisp/version.el'." >&5
+  { { echo "$as_me:12618: 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
@@ -12692,23 +12708,23 @@
 for ac_header in nlist.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12695: checking for $ac_header" >&5
+echo "$as_me:12711: 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 12701 "configure"
+#line 12717 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12705: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12721: \"$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:12711: \$? = $ac_status" >&5
+  echo "$as_me:12727: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12727,7 +12743,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12730: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12746: 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
@@ -12787,7 +12803,7 @@
 ## C preprocessor.
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 12790 "configure"
+#line 12806 "configure"
 #include "confdefs.h"
 yes..yes
 _ACEOF
@@ -12880,7 +12896,7 @@
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:12883: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:12899: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -13056,7 +13072,7 @@
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:13059: error: ambiguous option: $1
+    { { echo "$as_me:13075: 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;}
@@ -13075,7 +13091,7 @@
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:13078: error: unrecognized option: $1
+  -*) { { echo "$as_me:13094: 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;}
@@ -13131,7 +13147,7 @@
   "leim/Makefile" ) CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:src/config.in" ;;
-  *) { { echo "$as_me:13134: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:13150: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -13380,7 +13396,7 @@
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:13383: creating $ac_file" >&5
+    { echo "$as_me:13399: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -13398,7 +13414,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:13401: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:13417: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -13411,7 +13427,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:13414: error: cannot find input file: $f" >&5
+           { { echo "$as_me:13430: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -13472,7 +13488,7 @@
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:13475: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:13491: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -13483,7 +13499,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:13486: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:13502: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -13496,7 +13512,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:13499: error: cannot find input file: $f" >&5
+           { { echo "$as_me:13515: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -13613,7 +13629,7 @@
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:13616: $ac_file is unchanged" >&5
+      { echo "$as_me:13632: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \