about summary refs log tree commit diff stats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2373
1 files changed, 1068 insertions, 1305 deletions
diff --git a/configure b/configure
index 30743d19..c96f89e1 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in 2.8.7dev.10.
+# From configure.in 2.8.7dev.9.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20080325.
 #
@@ -21144,9 +21144,9 @@ test $cf_cv_tm_gmtoff = no && cat >>confdefs.h <<\EOF
 #define DONT_HAVE_TM_GMTOFF 1
 EOF
 
-echo "$as_me:21147: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6
-if test "${ac_cv_type_long+set}" = set; then
+echo "$as_me:21147: checking for off_t" >&5
+echo $ECHO_N "checking for off_t... $ECHO_C" >&6
+if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -21156,9 +21156,9 @@ $ac_includes_default
 int
 main ()
 {
-if ((long *) 0)
+if ((off_t *) 0)
   return 0;
-if (sizeof (long))
+if (sizeof (off_t))
   return 0;
   ;
   return 0;
@@ -21176,23 +21176,23 @@ if { (eval echo "$as_me:21168: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:21177: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_type_long=yes
+  ac_cv_type_off_t=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-ac_cv_type_long=no
+ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:21187: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
+echo "$as_me:21187: result: $ac_cv_type_off_t" >&5
+echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:21190: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long+set}" = set; then
+echo "$as_me:21190: checking size of off_t" >&5
+echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
+if test "${ac_cv_sizeof_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_long" = yes; then
+  if test "$ac_cv_type_off_t" = yes; then
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -21202,7 +21202,7 @@ $ac_includes_default
 int
 main ()
 {
-int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
+int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
   ;
   return 0;
 }
@@ -21228,7 +21228,7 @@ $ac_includes_default
 int
 main ()
 {
-int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
+int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
   ;
   return 0;
 }
@@ -21265,7 +21265,7 @@ $ac_includes_default
 int
 main ()
 {
-int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
+int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
   ;
   return 0;
 }
@@ -21302,7 +21302,7 @@ $ac_includes_default
 int
 main ()
 {
-int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
+int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
   ;
   return 0;
 }
@@ -21327,7 +21327,7 @@ ac_lo=`expr $ac_mid + 1`
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 done
-ac_cv_sizeof_long=$ac_lo
+ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
   { { echo "$as_me:21333: error: cannot run test program while cross compiling" >&5
@@ -21344,7 +21344,7 @@ main ()
 FILE *f = fopen ("conftest.val", "w");
 if (!f)
   $ac_main_return (1);
-fprintf (f, "%d", (sizeof (long)));
+fprintf (f, "%d", (sizeof (off_t)));
 fclose (f);
   ;
   return 0;
@@ -21361,7 +21361,7 @@ if { (eval echo "$as_me:21354: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:21362: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_sizeof_long=`cat conftest.val`
+  ac_cv_sizeof_off_t=`cat conftest.val`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
@@ -21372,18 +21372,18 @@ fi
 fi
 rm -f conftest.val
 else
-  ac_cv_sizeof_long=0
+  ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:21378: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+echo "$as_me:21378: result: $ac_cv_sizeof_off_t" >&5
+echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6
 cat >>confdefs.h <<EOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
+#define SIZEOF_OFF_T $ac_cv_sizeof_off_t
 EOF
 
-echo "$as_me:21384: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6
-if test "${ac_cv_type_off_t+set}" = set; then
+echo "$as_me:21384: checking for time_t" >&5
+echo $ECHO_N "checking for time_t... $ECHO_C" >&6
+if test "${ac_cv_type_time_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -21393,9 +21393,9 @@ $ac_includes_default
 int
 main ()
 {
-if ((off_t *) 0)
+if ((time_t *) 0)
   return 0;
-if (sizeof (off_t))
+if (sizeof (time_t))
   return 0;
   ;
   return 0;
@@ -21413,23 +21413,23 @@ if { (eval echo "$as_me:21405: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:21414: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_type_off_t=yes
+  ac_cv_type_time_t=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-ac_cv_type_off_t=no
+ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:21424: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6
+echo "$as_me:21424: result: $ac_cv_type_time_t" >&5
+echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:21427: checking size of off_t" >&5
-echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
-if test "${ac_cv_sizeof_off_t+set}" = set; then
+echo "$as_me:21427: checking size of time_t" >&5
+echo $ECHO_N "checking size of time_t... $ECHO_C" >&6
+if test "${ac_cv_sizeof_time_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_off_t" = yes; then
+  if test "$ac_cv_type_time_t" = yes; then
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -21439,7 +21439,7 @@ $ac_includes_default
 int
 main ()
 {
-int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
+int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
   ;
   return 0;
 }
@@ -21465,7 +21465,7 @@ $ac_includes_default
 int
 main ()
 {
-int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
+int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
   ;
   return 0;
 }
@@ -21502,7 +21502,7 @@ $ac_includes_default
 int
 main ()
 {
-int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
+int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
   ;
   return 0;
 }
@@ -21539,7 +21539,7 @@ $ac_includes_default
 int
 main ()
 {
-int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
+int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
   ;
   return 0;
 }
@@ -21564,7 +21564,7 @@ ac_lo=`expr $ac_mid + 1`
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 done
-ac_cv_sizeof_off_t=$ac_lo
+ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
   { { echo "$as_me:21570: error: cannot run test program while cross compiling" >&5
@@ -21581,7 +21581,7 @@ main ()
 FILE *f = fopen ("conftest.val", "w");
 if (!f)
   $ac_main_return (1);
-fprintf (f, "%d", (sizeof (off_t)));
+fprintf (f, "%d", (sizeof (time_t)));
 fclose (f);
   ;
   return 0;
@@ -21598,243 +21598,6 @@ if { (eval echo "$as_me:21591: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:21599: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_sizeof_off_t=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  ac_cv_sizeof_off_t=0
-fi
-fi
-echo "$as_me:21615: result: $ac_cv_sizeof_off_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6
-cat >>confdefs.h <<EOF
-#define SIZEOF_OFF_T $ac_cv_sizeof_off_t
-EOF
-
-echo "$as_me:21621: checking for time_t" >&5
-echo $ECHO_N "checking for time_t... $ECHO_C" >&6
-if test "${ac_cv_type_time_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 21627 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-if ((time_t *) 0)
-  return 0;
-if (sizeof (time_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21642: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:21645: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21648: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21651: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_time_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_time_t=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:21661: result: $ac_cv_type_time_t" >&5
-echo "${ECHO_T}$ac_cv_type_time_t" >&6
-
-echo "$as_me:21664: checking size of time_t" >&5
-echo $ECHO_N "checking size of time_t... $ECHO_C" >&6
-if test "${ac_cv_sizeof_time_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_time_t" = yes; then
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-#line 21673 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21685: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:21688: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21691: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21694: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line 21699 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21711: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:21714: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21717: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21720: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line 21736 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21748: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:21751: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21754: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21757: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-#line 21773 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21785: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:21788: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21791: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21794: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-ac_cv_sizeof_time_t=$ac_lo
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:21807: error: cannot run test program while cross compiling" >&5
-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 21812 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-FILE *f = fopen ("conftest.val", "w");
-if (!f)
-  $ac_main_return (1);
-fprintf (f, "%d", (sizeof (time_t)));
-fclose (f);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21828: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21831: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21833: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21836: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
   echo "$as_me: program exited with status $ac_status" >&5
@@ -21849,7 +21612,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:21852: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:21615: result: $ac_cv_sizeof_time_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_time_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_TIME_T $ac_cv_sizeof_time_t
@@ -21857,13 +21620,13 @@ EOF
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:21860: checking for working alloca.h" >&5
+echo "$as_me:21623: 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 21866 "configure"
+#line 21629 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -21875,16 +21638,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21878: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21641: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21881: \$? = $ac_status" >&5
+  echo "$as_me:21644: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21647: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21887: \$? = $ac_status" >&5
+  echo "$as_me:21650: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -21894,7 +21657,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21897: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:21660: 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
 
@@ -21904,13 +21667,13 @@ EOF
 
 fi
 
-echo "$as_me:21907: checking for alloca" >&5
+echo "$as_me:21670: 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 21913 "configure"
+#line 21676 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -21942,16 +21705,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21708: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21948: \$? = $ac_status" >&5
+  echo "$as_me:21711: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21954: \$? = $ac_status" >&5
+  echo "$as_me:21717: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -21961,7 +21724,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21964: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:21727: 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
@@ -21982,13 +21745,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:21985: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:21748: 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 21991 "configure"
+#line 21754 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -22006,18 +21769,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:22009: result: $ac_cv_os_cray" >&5
+echo "$as_me:21772: 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:22014: checking for $ac_func" >&5
+echo "$as_me:21777: 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 22020 "configure"
+#line 21783 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -22048,16 +21811,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22051: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21814: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22054: \$? = $ac_status" >&5
+  echo "$as_me:21817: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22060: \$? = $ac_status" >&5
+  echo "$as_me:21823: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22067,7 +21830,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22070: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:21833: 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
 
@@ -22081,7 +21844,7 @@ fi
   done
 fi
 
-echo "$as_me:22084: checking stack direction for C alloca" >&5
+echo "$as_me:21847: 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
@@ -22090,7 +21853,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22093 "configure"
+#line 21856 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -22113,15 +21876,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22116: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21879: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22119: \$? = $ac_status" >&5
+  echo "$as_me:21882: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22124: \$? = $ac_status" >&5
+  echo "$as_me:21887: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -22133,7 +21896,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:22136: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:21899: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -22145,23 +21908,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22148: checking for $ac_header" >&5
+echo "$as_me:21911: 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 22154 "configure"
+#line 21917 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22158: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21921: \"$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:22164: \$? = $ac_status" >&5
+  echo "$as_me:21927: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22180,7 +21943,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:22183: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21946: 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
@@ -22193,13 +21956,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:22196: checking for $ac_func" >&5
+echo "$as_me:21959: 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 22202 "configure"
+#line 21965 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -22230,16 +21993,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22233: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21996: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22236: \$? = $ac_status" >&5
+  echo "$as_me:21999: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22242: \$? = $ac_status" >&5
+  echo "$as_me:22005: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22249,7 +22012,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22252: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:22015: 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
@@ -22261,7 +22024,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:22264: checking for working fork" >&5
+  echo "$as_me:22027: 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
@@ -22284,15 +22047,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22287: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22050: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22290: \$? = $ac_status" >&5
+  echo "$as_me:22053: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22295: \$? = $ac_status" >&5
+  echo "$as_me:22058: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -22304,7 +22067,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:22307: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:22070: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -22318,12 +22081,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:22321: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:22084: 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:22326: checking for working vfork" >&5
+  echo "$as_me:22089: 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
@@ -22332,7 +22095,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22335 "configure"
+#line 22098 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -22429,15 +22192,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22432: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22195: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22435: \$? = $ac_status" >&5
+  echo "$as_me:22198: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22440: \$? = $ac_status" >&5
+  echo "$as_me:22203: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -22449,13 +22212,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:22452: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:22215: 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:22458: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:22221: 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
 
@@ -22480,14 +22243,14 @@ EOF
 
 fi
 
-echo "$as_me:22483: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:22246: checking if we should use fcntl or ioctl" >&5
 echo $ECHO_N "checking if we should use fcntl or ioctl... $ECHO_C" >&6
 if test "${cf_cv_fionbio+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 22490 "configure"
+#line 22253 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22504,16 +22267,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22507: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22270: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22510: \$? = $ac_status" >&5
+  echo "$as_me:22273: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22516: \$? = $ac_status" >&5
+  echo "$as_me:22279: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -22521,7 +22284,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 22524 "configure"
+#line 22287 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22543,16 +22306,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22546: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22309: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22549: \$? = $ac_status" >&5
+  echo "$as_me:22312: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22315: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22555: \$? = $ac_status" >&5
+  echo "$as_me:22318: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -22565,20 +22328,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:22568: result: $cf_cv_fionbio" >&5
+echo "$as_me:22331: result: $cf_cv_fionbio" >&5
 echo "${ECHO_T}$cf_cv_fionbio" >&6
 test "$cf_cv_fionbio" = "fcntl" && cat >>confdefs.h <<\EOF
 #define USE_FCNTL 1
 EOF
 
-echo "$as_me:22574: checking for broken/missing definition of remove" >&5
+echo "$as_me:22337: checking for broken/missing definition of remove" >&5
 echo $ECHO_N "checking for broken/missing definition of remove... $ECHO_C" >&6
 if test "${cf_cv_baddef_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 22581 "configure"
+#line 22344 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22590,23 +22353,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22593: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22356: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22596: \$? = $ac_status" >&5
+  echo "$as_me:22359: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22599: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22602: \$? = $ac_status" >&5
+  echo "$as_me:22365: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 22609 "configure"
+#line 22372 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -22619,16 +22382,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22622: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22385: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22625: \$? = $ac_status" >&5
+  echo "$as_me:22388: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22631: \$? = $ac_status" >&5
+  echo "$as_me:22394: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -22643,20 +22406,20 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:22646: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:22409: result: $cf_cv_baddef_remove" >&5
 echo "${ECHO_T}$cf_cv_baddef_remove" >&6
 test "$cf_cv_baddef_remove" != no && cat >>confdefs.h <<\EOF
 #define NEED_REMOVE 1
 EOF
 
-echo "$as_me:22652: checking for lstat" >&5
+echo "$as_me:22415: checking for lstat" >&5
 echo $ECHO_N "checking for lstat... $ECHO_C" >&6
 if test "${ac_cv_func_lstat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 22659 "configure"
+#line 22422 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22670,16 +22433,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22673: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22436: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22676: \$? = $ac_status" >&5
+  echo "$as_me:22439: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22682: \$? = $ac_status" >&5
+  echo "$as_me:22445: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -22691,7 +22454,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:22694: result: $ac_cv_func_lstat " >&5
+echo "$as_me:22457: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test $ac_cv_func_lstat = yes; then
 	cat >>confdefs.h <<\EOF
@@ -22725,13 +22488,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:22728: checking for $ac_func" >&5
+echo "$as_me:22491: 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 22734 "configure"
+#line 22497 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -22762,16 +22525,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22765: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22528: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22768: \$? = $ac_status" >&5
+  echo "$as_me:22531: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22534: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22774: \$? = $ac_status" >&5
+  echo "$as_me:22537: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22781,7 +22544,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22784: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:22547: 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
@@ -22797,13 +22560,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:22800: checking for $ac_func" >&5
+echo "$as_me:22563: 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 22806 "configure"
+#line 22569 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -22834,16 +22597,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22837: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22600: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22840: \$? = $ac_status" >&5
+  echo "$as_me:22603: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22846: \$? = $ac_status" >&5
+  echo "$as_me:22609: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22853,7 +22616,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22856: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:22619: 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
@@ -22865,7 +22628,7 @@ else
 fi
 done
 
-echo "$as_me:22868: checking for random-integer functions" >&5
+echo "$as_me:22631: checking for random-integer functions" >&5
 echo $ECHO_N "checking for random-integer functions... $ECHO_C" >&6
 if test "${cf_cv_srand_func+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22885,7 +22648,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 22888 "configure"
+#line 22651 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -22904,16 +22667,16 @@ long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22907: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22670: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22910: \$? = $ac_status" >&5
+  echo "$as_me:22673: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22916: \$? = $ac_status" >&5
+  echo "$as_me:22679: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -22925,10 +22688,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:22928: result: $cf_cv_srand_func" >&5
+echo "$as_me:22691: result: $cf_cv_srand_func" >&5
 echo "${ECHO_T}$cf_cv_srand_func" >&6
 if test "$cf_cv_srand_func" != unknown ; then
-	echo "$as_me:22931: checking for range of random-integers" >&5
+	echo "$as_me:22694: checking for range of random-integers" >&5
 echo $ECHO_N "checking for range of random-integers... $ECHO_C" >&6
 if test "${cf_cv_rand_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22949,7 +22712,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 22952 "configure"
+#line 22715 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -22968,16 +22731,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22971: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22734: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22974: \$? = $ac_status" >&5
+  echo "$as_me:22737: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22980: \$? = $ac_status" >&5
+  echo "$as_me:22743: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22988,7 +22751,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:22991: result: $cf_cv_rand_max" >&5
+echo "$as_me:22754: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
@@ -23019,13 +22782,13 @@ fi
 for ac_func in strstr
 do
 
-echo "$as_me:23022: checking for $ac_func declaration" >&5
+echo "$as_me:22785: checking for $ac_func declaration" >&5
 echo $ECHO_N "checking for $ac_func declaration... $ECHO_C" >&6
 if eval "test \"\${ac_cv_func_decl_$ac_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23028 "configure"
+#line 22791 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -23039,20 +22802,20 @@ extern	int	${ac_func}();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23042: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22805: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23045: \$? = $ac_status" >&5
+  echo "$as_me:22808: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23051: \$? = $ac_status" >&5
+  echo "$as_me:22814: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 23055 "configure"
+#line 22818 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -23066,16 +22829,16 @@ int	(*p)() = ${ac_func};
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23069: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22832: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23072: \$? = $ac_status" >&5
+  echo "$as_me:22835: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22838: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23078: \$? = $ac_status" >&5
+  echo "$as_me:22841: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -23096,11 +22859,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:23099: result: yes" >&5
+  echo "$as_me:22862: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:23103: result: no" >&5
+  echo "$as_me:22866: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -23115,13 +22878,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:23118: checking for $ac_func declaration" >&5
+echo "$as_me:22881: checking for $ac_func declaration" >&5
 echo $ECHO_N "checking for $ac_func declaration... $ECHO_C" >&6
 if eval "test \"\${ac_cv_func_decl_$ac_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23124 "configure"
+#line 22887 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -23137,20 +22900,20 @@ extern	int	${ac_func}();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23140: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22903: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23143: \$? = $ac_status" >&5
+  echo "$as_me:22906: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23149: \$? = $ac_status" >&5
+  echo "$as_me:22912: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 23153 "configure"
+#line 22916 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -23166,16 +22929,16 @@ int	(*p)() = ${ac_func};
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23169: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22932: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23172: \$? = $ac_status" >&5
+  echo "$as_me:22935: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22938: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23178: \$? = $ac_status" >&5
+  echo "$as_me:22941: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -23196,11 +22959,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:23199: result: yes" >&5
+  echo "$as_me:22962: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:23203: result: no" >&5
+  echo "$as_me:22966: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -23212,14 +22975,14 @@ EOF
 fi
 done
 
-echo "$as_me:23215: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:22978: checking if TRUE/FALSE are defined" >&5
 echo $ECHO_N "checking if TRUE/FALSE are defined... $ECHO_C" >&6
 if test "${cf_cv_bool_defs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 23222 "configure"
+#line 22985 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -23233,16 +22996,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23236: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22999: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23239: \$? = $ac_status" >&5
+  echo "$as_me:23002: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23245: \$? = $ac_status" >&5
+  echo "$as_me:23008: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -23253,7 +23016,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:23256: result: $cf_cv_bool_defs" >&5
+echo "$as_me:23019: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 	cat >>confdefs.h <<\EOF
@@ -23266,14 +23029,14 @@ EOF
 
 fi
 
-echo "$as_me:23269: checking if external errno is declared" >&5
+echo "$as_me:23032: checking if external errno is declared" >&5
 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 23276 "configure"
+#line 23039 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -23291,16 +23054,16 @@ long x = (long) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23294: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23057: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23297: \$? = $ac_status" >&5
+  echo "$as_me:23060: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23303: \$? = $ac_status" >&5
+  echo "$as_me:23066: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -23311,7 +23074,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:23314: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:23077: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -23326,14 +23089,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:23329: checking if external errno exists" >&5
+echo "$as_me:23092: checking if external errno exists" >&5
 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
 if test "${cf_cv_have_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 23336 "configure"
+#line 23099 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -23348,16 +23111,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23351: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23114: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23354: \$? = $ac_status" >&5
+  echo "$as_me:23117: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23357: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23360: \$? = $ac_status" >&5
+  echo "$as_me:23123: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -23368,7 +23131,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:23371: result: $cf_cv_have_errno" >&5
+echo "$as_me:23134: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -23381,7 +23144,7 @@ EOF
 
 fi
 
-echo "$as_me:23384: checking if we can set errno" >&5
+echo "$as_me:23147: checking if we can set errno" >&5
 echo $ECHO_N "checking if we can set errno... $ECHO_C" >&6
 if test "${cf_cv_set_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23389,7 +23152,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 23392 "configure"
+#line 23155 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -23401,16 +23164,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23404: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23167: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23407: \$? = $ac_status" >&5
+  echo "$as_me:23170: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23173: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23413: \$? = $ac_status" >&5
+  echo "$as_me:23176: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -23421,7 +23184,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23424 "configure"
+#line 23187 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -23432,15 +23195,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23435: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23438: \$? = $ac_status" >&5
+  echo "$as_me:23201: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23443: \$? = $ac_status" >&5
+  echo "$as_me:23206: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -23453,20 +23216,20 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:23456: result: $cf_cv_set_errno" >&5
+echo "$as_me:23219: result: $cf_cv_set_errno" >&5
 echo "${ECHO_T}$cf_cv_set_errno" >&6
 test "$cf_cv_set_errno" != no && cat >>confdefs.h <<\EOF
 #define CAN_SET_ERRNO 1
 EOF
 
-echo "$as_me:23462: checking for setlocale()" >&5
+echo "$as_me:23225: checking for setlocale()" >&5
 echo $ECHO_N "checking for setlocale()... $ECHO_C" >&6
 if test "${cf_cv_locale+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 23469 "configure"
+#line 23232 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -23478,16 +23241,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23481: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23244: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23484: \$? = $ac_status" >&5
+  echo "$as_me:23247: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23490: \$? = $ac_status" >&5
+  echo "$as_me:23253: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -23499,21 +23262,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:23502: result: $cf_cv_locale" >&5
+echo "$as_me:23265: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && { cat >>confdefs.h <<\EOF
 #define LOCALE 1
 EOF
  }
 
-echo "$as_me:23509: checking if NGROUPS is defined" >&5
+echo "$as_me:23272: checking if NGROUPS is defined" >&5
 echo $ECHO_N "checking if NGROUPS is defined... $ECHO_C" >&6
 if test "${cf_cv_ngroups+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 23516 "configure"
+#line 23279 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -23532,23 +23295,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23535: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23298: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23538: \$? = $ac_status" >&5
+  echo "$as_me:23301: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23541: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23544: \$? = $ac_status" >&5
+  echo "$as_me:23307: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 23551 "configure"
+#line 23314 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -23567,16 +23330,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23570: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23333: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23573: \$? = $ac_status" >&5
+  echo "$as_me:23336: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23579: \$? = $ac_status" >&5
+  echo "$as_me:23342: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -23588,7 +23351,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:23591: result: $cf_cv_ngroups" >&5
+echo "$as_me:23354: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -23605,14 +23368,14 @@ EOF
 
 fi
 
-echo "$as_me:23608: checking if external sys_nerr is declared" >&5
+echo "$as_me:23371: checking if external sys_nerr is declared" >&5
 echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_sys_nerr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 23615 "configure"
+#line 23378 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -23630,16 +23393,16 @@ long x = (long) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23633: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23396: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23636: \$? = $ac_status" >&5
+  echo "$as_me:23399: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23642: \$? = $ac_status" >&5
+  echo "$as_me:23405: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -23650,7 +23413,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:23653: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:23416: result: $cf_cv_dcl_sys_nerr" >&5
 echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6
 
 if test "$cf_cv_dcl_sys_nerr" = no ; then
@@ -23665,14 +23428,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:23668: checking if external sys_nerr exists" >&5
+echo "$as_me:23431: checking if external sys_nerr exists" >&5
 echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6
 if test "${cf_cv_have_sys_nerr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 23675 "configure"
+#line 23438 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -23687,16 +23450,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23690: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23453: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23693: \$? = $ac_status" >&5
+  echo "$as_me:23456: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23699: \$? = $ac_status" >&5
+  echo "$as_me:23462: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -23707,7 +23470,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:23710: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:23473: result: $cf_cv_have_sys_nerr" >&5
 echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6
 
 if test "$cf_cv_have_sys_nerr" = yes ; then
@@ -23720,14 +23483,14 @@ EOF
 
 fi
 
-echo "$as_me:23723: checking if external sys_errlist is declared" >&5
+echo "$as_me:23486: checking if external sys_errlist is declared" >&5
 echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_sys_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 23730 "configure"
+#line 23493 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -23745,16 +23508,16 @@ long x = (long) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23748: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23511: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23751: \$? = $ac_status" >&5
+  echo "$as_me:23514: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23754: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23757: \$? = $ac_status" >&5
+  echo "$as_me:23520: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -23765,7 +23528,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:23768: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:23531: result: $cf_cv_dcl_sys_errlist" >&5
 echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6
 
 if test "$cf_cv_dcl_sys_errlist" = no ; then
@@ -23780,14 +23543,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:23783: checking if external sys_errlist exists" >&5
+echo "$as_me:23546: checking if external sys_errlist exists" >&5
 echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6
 if test "${cf_cv_have_sys_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 23790 "configure"
+#line 23553 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -23802,16 +23565,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23805: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23568: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23808: \$? = $ac_status" >&5
+  echo "$as_me:23571: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23814: \$? = $ac_status" >&5
+  echo "$as_me:23577: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -23822,7 +23585,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:23825: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:23588: result: $cf_cv_have_sys_errlist" >&5
 echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6
 
 if test "$cf_cv_have_sys_errlist" = yes ; then
@@ -23838,23 +23601,23 @@ fi
 for ac_header in lastlog.h paths.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23841: checking for $ac_header" >&5
+echo "$as_me:23604: 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 23847 "configure"
+#line 23610 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23851: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:23614: \"$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:23857: \$? = $ac_status" >&5
+  echo "$as_me:23620: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23873,7 +23636,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:23876: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:23639: 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
@@ -23883,14 +23646,14 @@ EOF
 fi
 done
 
-echo "$as_me:23886: checking for lastlog path" >&5
+echo "$as_me:23649: checking for lastlog path" >&5
 echo $ECHO_N "checking for lastlog path... $ECHO_C" >&6
 if test "${cf_cv_path_lastlog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 23893 "configure"
+#line 23656 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -23910,16 +23673,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23913: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23676: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23916: \$? = $ac_status" >&5
+  echo "$as_me:23679: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23922: \$? = $ac_status" >&5
+  echo "$as_me:23685: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -23934,13 +23697,13 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:23937: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:23700: result: $cf_cv_path_lastlog" >&5
 echo "${ECHO_T}$cf_cv_path_lastlog" >&6
 test $cf_cv_path_lastlog != no && cat >>confdefs.h <<\EOF
 #define USE_LASTLOG 1
 EOF
 
-echo "$as_me:23943: checking for utmp implementation" >&5
+echo "$as_me:23706: checking for utmp implementation" >&5
 echo $ECHO_N "checking for utmp implementation... $ECHO_C" >&6
 if test "${cf_cv_have_utmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23957,7 +23720,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23960 "configure"
+#line 23723 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -23971,16 +23734,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23974: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23737: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23977: \$? = $ac_status" >&5
+  echo "$as_me:23740: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23983: \$? = $ac_status" >&5
+  echo "$as_me:23746: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -23989,7 +23752,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23992 "configure"
+#line 23755 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -24003,16 +23766,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24006: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23769: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24009: \$? = $ac_status" >&5
+  echo "$as_me:23772: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24015: \$? = $ac_status" >&5
+  echo "$as_me:23778: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -24027,7 +23790,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:24030: result: $cf_cv_have_utmp" >&5
+echo "$as_me:23793: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -24040,14 +23803,14 @@ EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:24043: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:23806: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_host is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24050 "configure"
+#line 23813 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24061,16 +23824,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24064: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23827: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24067: \$? = $ac_status" >&5
+  echo "$as_me:23830: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24070: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24073: \$? = $ac_status" >&5
+  echo "$as_me:23836: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -24082,7 +23845,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:24085: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:23848: result: $cf_cv_have_utmp_ut_host" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_host" >&6
 test $cf_cv_have_utmp_ut_host != no && cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_HOST 1
@@ -24091,14 +23854,14 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:24094: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:23857: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_syslen is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_syslen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24101 "configure"
+#line 23864 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24112,16 +23875,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24115: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23878: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24118: \$? = $ac_status" >&5
+  echo "$as_me:23881: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24124: \$? = $ac_status" >&5
+  echo "$as_me:23887: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -24133,7 +23896,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:24136: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:23899: result: $cf_cv_have_utmp_ut_syslen" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_syslen" >&6
 test $cf_cv_have_utmp_ut_syslen != no && cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_SYSLEN 1
@@ -24142,7 +23905,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:24145: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:23908: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_name is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_name+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24159,7 +23922,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24162 "configure"
+#line 23925 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -24173,16 +23936,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24176: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23939: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24179: \$? = $ac_status" >&5
+  echo "$as_me:23942: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23945: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24185: \$? = $ac_status" >&5
+  echo "$as_me:23948: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -24194,12 +23957,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:24197: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:23960: result: $cf_cv_have_utmp_ut_name" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6
 
 case $cf_cv_have_utmp_ut_name in #(vi
 no) #(vi
-	{ { echo "$as_me:24202: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:23965: error: Cannot find declaration for ut.ut_name" >&5
 echo "$as_me: error: Cannot find declaration for ut.ut_name" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -24213,7 +23976,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:24216: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:23979: checking for exit-status in $cf_cv_have_utmp" >&5
 echo $ECHO_N "checking for exit-status in $cf_cv_have_utmp... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_xstatus+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24226,7 +23989,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 24229 "configure"
+#line 23992 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24240,16 +24003,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24243: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24006: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24246: \$? = $ac_status" >&5
+  echo "$as_me:24009: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24252: \$? = $ac_status" >&5
+  echo "$as_me:24015: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -24262,7 +24025,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:24265: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:24028: result: $cf_cv_have_utmp_ut_xstatus" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xstatus" >&6
 if test $cf_cv_have_utmp_ut_xstatus != no ; then
 	cat >>confdefs.h <<\EOF
@@ -24277,14 +24040,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:24280: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:24043: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_xtime is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_xtime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24287 "configure"
+#line 24050 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24298,23 +24061,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24301: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24064: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24304: \$? = $ac_status" >&5
+  echo "$as_me:24067: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24070: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24310: \$? = $ac_status" >&5
+  echo "$as_me:24073: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 24317 "configure"
+#line 24080 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24328,16 +24091,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24331: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24094: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24334: \$? = $ac_status" >&5
+  echo "$as_me:24097: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24340: \$? = $ac_status" >&5
+  echo "$as_me:24103: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -24351,7 +24114,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:24354: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:24117: result: $cf_cv_have_utmp_ut_xtime" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xtime" >&6
 if test $cf_cv_have_utmp_ut_xtime != no ; then
 	cat >>confdefs.h <<\EOF
@@ -24368,14 +24131,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:24371: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:24134: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_session is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_session+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24378 "configure"
+#line 24141 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24389,16 +24152,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24392: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24155: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24395: \$? = $ac_status" >&5
+  echo "$as_me:24158: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24401: \$? = $ac_status" >&5
+  echo "$as_me:24164: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -24409,7 +24172,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:24412: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:24175: result: $cf_cv_have_utmp_ut_session" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_session" >&6
 if test $cf_cv_have_utmp_ut_session != no ; then
 	cat >>confdefs.h <<\EOF
@@ -24419,7 +24182,7 @@ EOF
 fi
 fi
 
-echo "$as_me:24422: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:24185: checking if $cf_cv_have_utmp is SYSV flavor" >&5
 echo $ECHO_N "checking if $cf_cv_have_utmp is SYSV flavor... $ECHO_C" >&6
 if test "${cf_cv_sysv_utmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24427,7 +24190,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24430 "configure"
+#line 24193 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24446,16 +24209,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24449: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24212: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24452: \$? = $ac_status" >&5
+  echo "$as_me:24215: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24455: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24218: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24458: \$? = $ac_status" >&5
+  echo "$as_me:24221: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -24466,7 +24229,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:24469: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:24232: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test $cf_cv_sysv_utmp = yes && cat >>confdefs.h <<\EOF
 #define USE_SYSV_UTMP 1
@@ -24474,14 +24237,14 @@ EOF
 
 fi
 
-echo "$as_me:24477: checking if external h_errno exists" >&5
+echo "$as_me:24240: checking if external h_errno exists" >&5
 echo $ECHO_N "checking if external h_errno exists... $ECHO_C" >&6
 if test "${cf_cv_have_h_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 24484 "configure"
+#line 24247 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -24496,16 +24259,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24499: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24262: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24502: \$? = $ac_status" >&5
+  echo "$as_me:24265: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24508: \$? = $ac_status" >&5
+  echo "$as_me:24271: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -24516,7 +24279,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:24519: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:24282: result: $cf_cv_have_h_errno" >&5
 echo "${ECHO_T}$cf_cv_have_h_errno" >&6
 
 if test "$cf_cv_have_h_errno" = yes ; then
@@ -24529,7 +24292,7 @@ EOF
 
 fi
 
-echo "$as_me:24532: checking if bibp: URLs should be supported" >&5
+echo "$as_me:24295: checking if bibp: URLs should be supported" >&5
 echo $ECHO_N "checking if bibp: URLs should be supported... $ECHO_C" >&6
 
 # Check whether --enable-bibp-urls or --disable-bibp-urls was given.
@@ -24546,13 +24309,13 @@ else
   use_bibp_urls=yes
 
 fi;
-echo "$as_me:24549: result: $use_bibp_urls" >&5
+echo "$as_me:24312: result: $use_bibp_urls" >&5
 echo "${ECHO_T}$use_bibp_urls" >&6
 test $use_bibp_urls = no && cat >>confdefs.h <<\EOF
 #define DISABLE_BIBP 1
 EOF
 
-echo "$as_me:24555: checking if configuration info should be browsable" >&5
+echo "$as_me:24318: checking if configuration info should be browsable" >&5
 echo $ECHO_N "checking if configuration info should be browsable... $ECHO_C" >&6
 
 # Check whether --enable-config-info or --disable-config-info was given.
@@ -24569,13 +24332,13 @@ else
   use_config_info=yes
 
 fi;
-echo "$as_me:24572: result: $use_config_info" >&5
+echo "$as_me:24335: result: $use_config_info" >&5
 echo "${ECHO_T}$use_config_info" >&6
 test $use_config_info = no && cat >>confdefs.h <<\EOF
 #define NO_CONFIG_INFO 1
 EOF
 
-echo "$as_me:24578: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:24341: checking if new-style forms-based options screen should be used" >&5
 echo $ECHO_N "checking if new-style forms-based options screen should be used... $ECHO_C" >&6
 
 # Check whether --enable-forms-options or --disable-forms-options was given.
@@ -24592,13 +24355,13 @@ else
   use_forms_options=yes
 
 fi;
-echo "$as_me:24595: result: $use_forms_options" >&5
+echo "$as_me:24358: result: $use_forms_options" >&5
 echo "${ECHO_T}$use_forms_options" >&6
 test $use_forms_options = no && cat >>confdefs.h <<\EOF
 #define NO_OPTION_FORMS 1
 EOF
 
-echo "$as_me:24601: checking if old-style options menu should be used" >&5
+echo "$as_me:24364: checking if old-style options menu should be used" >&5
 echo $ECHO_N "checking if old-style options menu should be used... $ECHO_C" >&6
 
 # Check whether --enable-menu-options or --disable-menu-options was given.
@@ -24615,13 +24378,13 @@ else
   use_menu_options=yes
 
 fi;
-echo "$as_me:24618: result: $use_menu_options" >&5
+echo "$as_me:24381: result: $use_menu_options" >&5
 echo "${ECHO_T}$use_menu_options" >&6
 test $use_menu_options = no && cat >>confdefs.h <<\EOF
 #define NO_OPTION_MENU 1
 EOF
 
-echo "$as_me:24624: checking if experimental address-list page should be used" >&5
+echo "$as_me:24387: checking if experimental address-list page should be used" >&5
 echo $ECHO_N "checking if experimental address-list page should be used... $ECHO_C" >&6
 
 # Check whether --enable-addrlist-page or --disable-addrlist-page was given.
@@ -24638,13 +24401,13 @@ else
   use_addrlist_page=no
 
 fi;
-echo "$as_me:24641: result: $use_addrlist_page" >&5
+echo "$as_me:24404: result: $use_addrlist_page" >&5
 echo "${ECHO_T}$use_addrlist_page" >&6
 test $use_addrlist_page != no && cat >>confdefs.h <<\EOF
 #define EXP_ADDRLIST_PAGE 1
 EOF
 
-echo "$as_me:24647: checking if experimental charset-selection logic should be used" >&5
+echo "$as_me:24410: checking if experimental charset-selection logic should be used" >&5
 echo $ECHO_N "checking if experimental charset-selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-charset-choice or --disable-charset-choice was given.
@@ -24661,13 +24424,13 @@ else
   use_charset_choice=no
 
 fi;
-echo "$as_me:24664: result: $use_charset_choice" >&5
+echo "$as_me:24427: result: $use_charset_choice" >&5
 echo "${ECHO_T}$use_charset_choice" >&6
 test $use_charset_choice != no && cat >>confdefs.h <<\EOF
 #define EXP_CHARSET_CHOICE 1
 EOF
 
-echo "$as_me:24670: checking if experimental CJK logic should be used" >&5
+echo "$as_me:24433: checking if experimental CJK logic should be used" >&5
 echo $ECHO_N "checking if experimental CJK logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-cjk or --disable-cjk was given.
@@ -24684,13 +24447,13 @@ else
   use_cjk=no
 
 fi;
-echo "$as_me:24687: result: $use_cjk" >&5
+echo "$as_me:24450: result: $use_cjk" >&5
 echo "${ECHO_T}$use_cjk" >&6
 test $use_cjk != no && cat >>confdefs.h <<\EOF
 #define CJK_EX 1
 EOF
 
-echo "$as_me:24693: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:24456: checking if experimental Japanese UTF-8 logic should be used" >&5
 echo $ECHO_N "checking if experimental Japanese UTF-8 logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-japanese-utf8 or --disable-japanese-utf8 was given.
@@ -24707,7 +24470,7 @@ else
   use_ja_utf8=no
 
 fi;
-echo "$as_me:24710: result: $use_ja_utf8" >&5
+echo "$as_me:24473: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 	cat >>confdefs.h <<\EOF
@@ -24752,7 +24515,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 24755 "configure"
+#line 24518 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24764,16 +24527,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24767: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24530: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24770: \$? = $ac_status" >&5
+  echo "$as_me:24533: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24776: \$? = $ac_status" >&5
+  echo "$as_me:24539: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24790,7 +24553,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:24793: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:24556: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -24831,7 +24594,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 24834 "configure"
+#line 24597 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24843,16 +24606,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24846: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24609: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24849: \$? = $ac_status" >&5
+  echo "$as_me:24612: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24615: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24855: \$? = $ac_status" >&5
+  echo "$as_me:24618: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24869,7 +24632,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:24872: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:24635: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -24885,7 +24648,7 @@ echo "${as_me-configure}:24872: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:24888: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:24651: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -24910,7 +24673,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:24913: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:24676: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -24939,7 +24702,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:24942: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:24705: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -24948,7 +24711,7 @@ echo "${as_me-configure}:24942: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:24951: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:24714: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -24959,7 +24722,7 @@ done
 
 fi;
 
-  echo "$as_me:24962: checking for iconv" >&5
+  echo "$as_me:24725: checking for iconv" >&5
 echo $ECHO_N "checking for iconv... $ECHO_C" >&6
 if test "${am_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24970,10 +24733,10 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me-configure}:24973: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:24736: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 24976 "configure"
+#line 24739 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -24992,16 +24755,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24995: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24998: \$? = $ac_status" >&5
+  echo "$as_me:24761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25004: \$? = $ac_status" >&5
+  echo "$as_me:24767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_iconv=yes
 else
@@ -25010,7 +24773,7 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_iconv=no
 
-echo "${as_me-configure}:25013: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:24776: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -25091,11 +24854,11 @@ test -d "$oldincludedir" && {
       if test -d $cf_cv_header_path_iconv ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me-configure}:25094: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:24857: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
         cat >conftest.$ac_ext <<_ACEOF
-#line 25098 "configure"
+#line 24861 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -25114,21 +24877,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25117: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24880: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25120: \$? = $ac_status" >&5
+  echo "$as_me:24883: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25126: \$? = $ac_status" >&5
+  echo "$as_me:24889: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found iconv headers in $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me-configure}:25131: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:24894: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -25146,7 +24909,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me-configure}:25149: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:24912: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -25214,13 +24977,13 @@ test -d "$HOME" && \
           if test -d $cf_cv_library_path_iconv ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me-configure}:25217: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:24980: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-liconv  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv"
             cat >conftest.$ac_ext <<_ACEOF
-#line 25223 "configure"
+#line 24986 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -25239,21 +25002,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25242: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25005: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25245: \$? = $ac_status" >&5
+  echo "$as_me:25008: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25251: \$? = $ac_status" >&5
+  echo "$as_me:25014: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found iconv library in $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me-configure}:25256: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:25019: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -25289,7 +25052,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:25292: result: $am_cv_func_iconv" >&5
+echo "$as_me:25055: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -25298,14 +25061,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:25301: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:25064: checking if the declaration of iconv() needs const." >&5
 echo $ECHO_N "checking if the declaration of iconv() needs const.... $ECHO_C" >&6
 if test "${am_cv_proto_iconv_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
       cat >conftest.$ac_ext <<_ACEOF
-#line 25308 "configure"
+#line 25071 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -25330,16 +25093,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25333: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25096: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25336: \$? = $ac_status" >&5
+  echo "$as_me:25099: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25342: \$? = $ac_status" >&5
+  echo "$as_me:25105: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -25349,7 +25112,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25352: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:25115: result: $am_cv_proto_iconv_const" >&5
 echo "${ECHO_T}$am_cv_proto_iconv_const" >&6
 
     if test "$am_cv_proto_iconv_const" = yes ; then
@@ -25391,7 +25154,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 25394 "configure"
+#line 25157 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25403,16 +25166,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25406: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25169: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25409: \$? = $ac_status" >&5
+  echo "$as_me:25172: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25415: \$? = $ac_status" >&5
+  echo "$as_me:25178: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -25429,7 +25192,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:25432: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:25195: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -25466,7 +25229,7 @@ if test -n "$cf_cv_library_path_iconv" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:25469: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:25232: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -25490,7 +25253,7 @@ curses|slang|ncurses*)
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:25493: checking if you want to use default-colors" >&5
+echo "$as_me:25256: checking if you want to use default-colors" >&5
 echo $ECHO_N "checking if you want to use default-colors... $ECHO_C" >&6
 
 # Check whether --enable-default-colors or --disable-default-colors was given.
@@ -25507,7 +25270,7 @@ else
   use_dft_colors=no
 
 fi;
-echo "$as_me:25510: result: $use_dft_colors" >&5
+echo "$as_me:25273: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test $use_dft_colors = "yes" && cat >>confdefs.h <<\EOF
 #define USE_DEFAULT_COLORS 1
@@ -25515,7 +25278,7 @@ EOF
 
 fi
 
-echo "$as_me:25518: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:25281: checking if experimental keyboard-layout logic should be used" >&5
 echo $ECHO_N "checking if experimental keyboard-layout logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-kbd-layout or --disable-kbd-layout was given.
@@ -25532,13 +25295,13 @@ else
   use_kbd_layout=no
 
 fi;
-echo "$as_me:25535: result: $use_kbd_layout" >&5
+echo "$as_me:25298: result: $use_kbd_layout" >&5
 echo "${ECHO_T}$use_kbd_layout" >&6
 test $use_kbd_layout != no && cat >>confdefs.h <<\EOF
 #define EXP_KEYBOARD_LAYOUT 1
 EOF
 
-echo "$as_me:25541: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:25304: checking if experimental nested-table logic should be used" >&5
 echo $ECHO_N "checking if experimental nested-table logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-nested-tables or --disable-nested-tables was given.
@@ -25555,13 +25318,13 @@ else
   use_nested_tables=no
 
 fi;
-echo "$as_me:25558: result: $use_nested_tables" >&5
+echo "$as_me:25321: result: $use_nested_tables" >&5
 echo "${ECHO_T}$use_nested_tables" >&6
 test $use_nested_tables != no && cat >>confdefs.h <<\EOF
 #define EXP_NESTED_TABLES 1
 EOF
 
-echo "$as_me:25564: checking if progress-bar code should be used" >&5
+echo "$as_me:25327: checking if progress-bar code should be used" >&5
 echo $ECHO_N "checking if progress-bar code should be used... $ECHO_C" >&6
 
 # Check whether --enable-progressbar or --disable-progressbar was given.
@@ -25578,13 +25341,13 @@ else
   use_progressbar=no
 
 fi;
-echo "$as_me:25581: result: $use_progressbar" >&5
+echo "$as_me:25344: result: $use_progressbar" >&5
 echo "${ECHO_T}$use_progressbar" >&6
 test $use_progressbar != no && cat >>confdefs.h <<\EOF
 #define USE_PROGRESSBAR 1
 EOF
 
-echo "$as_me:25587: checking if scrollbar code should be used" >&5
+echo "$as_me:25350: checking if scrollbar code should be used" >&5
 echo $ECHO_N "checking if scrollbar code should be used... $ECHO_C" >&6
 
 # Check whether --enable-scrollbar or --disable-scrollbar was given.
@@ -25601,10 +25364,10 @@ else
   use_scrollbar=no
 
 fi;
-echo "$as_me:25604: result: $use_scrollbar" >&5
+echo "$as_me:25367: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:25607: checking if sessions code should be used" >&5
+echo "$as_me:25370: checking if sessions code should be used" >&5
 echo $ECHO_N "checking if sessions code should be used... $ECHO_C" >&6
 
 # Check whether --enable-sessions or --disable-sessions was given.
@@ -25621,7 +25384,7 @@ else
   use_sessions=no
 
 fi;
-echo "$as_me:25624: result: $use_sessions" >&5
+echo "$as_me:25387: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
     cat >>confdefs.h <<\EOF
@@ -25631,7 +25394,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:25634: checking if session-caching code should be used" >&5
+echo "$as_me:25397: checking if session-caching code should be used" >&5
 echo $ECHO_N "checking if session-caching code should be used... $ECHO_C" >&6
 
 # Check whether --enable-session-cache or --disable-session-cache was given.
@@ -25648,7 +25411,7 @@ else
   use_session_cache=no
 
 fi;
-echo "$as_me:25651: result: $use_session_cache" >&5
+echo "$as_me:25414: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
     cat >>confdefs.h <<\EOF
@@ -25657,7 +25420,7 @@ EOF
 
 fi
 
-echo "$as_me:25660: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:25423: checking if alternative line-edit bindings should be used" >&5
 echo $ECHO_N "checking if alternative line-edit bindings should be used... $ECHO_C" >&6
 
 # Check whether --enable-alt-bindings or --disable-alt-bindings was given.
@@ -25674,13 +25437,13 @@ else
   use_alt_bindings=yes
 
 fi;
-echo "$as_me:25677: result: $use_alt_bindings" >&5
+echo "$as_me:25440: result: $use_alt_bindings" >&5
 echo "${ECHO_T}$use_alt_bindings" >&6
 test $use_alt_bindings != no && cat >>confdefs.h <<\EOF
 #define EXP_ALT_BINDINGS 1
 EOF
 
-echo "$as_me:25683: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:25446: checking if you want to use extended HTML DTD logic" >&5
 echo $ECHO_N "checking if you want to use extended HTML DTD logic... $ECHO_C" >&6
 
 # Check whether --enable-extended-dtd or --disable-extended-dtd was given.
@@ -25697,13 +25460,13 @@ else
   use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:25700: result: $use_ext_htmldtd" >&5
+echo "$as_me:25463: result: $use_ext_htmldtd" >&5
 echo "${ECHO_T}$use_ext_htmldtd" >&6
 test $use_ext_htmldtd = "no" && cat >>confdefs.h <<\EOF
 #define NO_EXTENDED_HTMLDTD 1
 EOF
 
-echo "$as_me:25706: checking if file-upload logic should be used" >&5
+echo "$as_me:25469: checking if file-upload logic should be used" >&5
 echo $ECHO_N "checking if file-upload logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-file-upload or --disable-file-upload was given.
@@ -25720,13 +25483,13 @@ else
   use_file_upload=yes
 
 fi;
-echo "$as_me:25723: result: $use_file_upload" >&5
+echo "$as_me:25486: result: $use_file_upload" >&5
 echo "${ECHO_T}$use_file_upload" >&6
 test $use_file_upload != no && cat >>confdefs.h <<\EOF
 #define USE_FILE_UPLOAD 1
 EOF
 
-echo "$as_me:25729: checking if element-justification logic should be used" >&5
+echo "$as_me:25492: checking if element-justification logic should be used" >&5
 echo $ECHO_N "checking if element-justification logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-justify-elts or --disable-justify-elts was given.
@@ -25743,13 +25506,13 @@ else
   use_justify_elts=yes
 
 fi;
-echo "$as_me:25746: result: $use_justify_elts" >&5
+echo "$as_me:25509: result: $use_justify_elts" >&5
 echo "${ECHO_T}$use_justify_elts" >&6
 test $use_justify_elts != no && cat >>confdefs.h <<\EOF
 #define EXP_JUSTIFY_ELTS 1
 EOF
 
-echo "$as_me:25752: checking if partial-display should be used" >&5
+echo "$as_me:25515: checking if partial-display should be used" >&5
 echo $ECHO_N "checking if partial-display should be used... $ECHO_C" >&6
 
 # Check whether --enable-partial or --disable-partial was given.
@@ -25766,13 +25529,13 @@ else
   use_partial_display=yes
 
 fi;
-echo "$as_me:25769: result: $use_partial_display" >&5
+echo "$as_me:25532: result: $use_partial_display" >&5
 echo "${ECHO_T}$use_partial_display" >&6
 test $use_partial_display != no && cat >>confdefs.h <<\EOF
 #define DISP_PARTIAL 1
 EOF
 
-echo "$as_me:25775: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:25538: checking if persistent-cookie logic should be used" >&5
 echo $ECHO_N "checking if persistent-cookie logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-persistent-cookies or --disable-persistent-cookies was given.
@@ -25789,13 +25552,13 @@ else
   use_filed_cookies=yes
 
 fi;
-echo "$as_me:25792: result: $use_filed_cookies" >&5
+echo "$as_me:25555: result: $use_filed_cookies" >&5
 echo "${ECHO_T}$use_filed_cookies" >&6
 test $use_filed_cookies != no && cat >>confdefs.h <<\EOF
 #define USE_PERSISTENT_COOKIES 1
 EOF
 
-echo "$as_me:25798: checking if html source should be colorized" >&5
+echo "$as_me:25561: checking if html source should be colorized" >&5
 echo $ECHO_N "checking if html source should be colorized... $ECHO_C" >&6
 
 # Check whether --enable-prettysrc or --disable-prettysrc was given.
@@ -25812,13 +25575,13 @@ else
   use_prettysrc=yes
 
 fi;
-echo "$as_me:25815: result: $use_prettysrc" >&5
+echo "$as_me:25578: result: $use_prettysrc" >&5
 echo "${ECHO_T}$use_prettysrc" >&6
 test $use_prettysrc != no && cat >>confdefs.h <<\EOF
 #define USE_PRETTYSRC 1
 EOF
 
-echo "$as_me:25821: checking if read-progress message should show ETA" >&5
+echo "$as_me:25584: checking if read-progress message should show ETA" >&5
 echo $ECHO_N "checking if read-progress message should show ETA... $ECHO_C" >&6
 
 # Check whether --enable-read-eta or --disable-read-eta was given.
@@ -25835,13 +25598,13 @@ else
   use_read_eta=yes
 
 fi;
-echo "$as_me:25838: result: $use_read_eta" >&5
+echo "$as_me:25601: result: $use_read_eta" >&5
 echo "${ECHO_T}$use_read_eta" >&6
 test $use_read_eta != no && cat >>confdefs.h <<\EOF
 #define USE_READPROGRESS 1
 EOF
 
-echo "$as_me:25844: checking if source caching should be used" >&5
+echo "$as_me:25607: checking if source caching should be used" >&5
 echo $ECHO_N "checking if source caching should be used... $ECHO_C" >&6
 
 # Check whether --enable-source-cache or --disable-source-cache was given.
@@ -25858,13 +25621,13 @@ else
   use_source_cache=yes
 
 fi;
-echo "$as_me:25861: result: $use_source_cache" >&5
+echo "$as_me:25624: result: $use_source_cache" >&5
 echo "${ECHO_T}$use_source_cache" >&6
 test $use_source_cache != no && cat >>confdefs.h <<\EOF
 #define USE_SOURCE_CACHE 1
 EOF
 
-echo "$as_me:25867: checking if you want to use external commands" >&5
+echo "$as_me:25630: checking if you want to use external commands" >&5
 echo $ECHO_N "checking if you want to use external commands... $ECHO_C" >&6
 
 # Check whether --enable-externs or --disable-externs was given.
@@ -25881,7 +25644,7 @@ else
   use_externs=no
 
 fi;
-echo "$as_me:25884: result: $use_externs" >&5
+echo "$as_me:25647: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 	cat >>confdefs.h <<\EOF
@@ -25891,7 +25654,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:25894: checking if you want to use setfont support" >&5
+echo "$as_me:25657: checking if you want to use setfont support" >&5
 echo $ECHO_N "checking if you want to use setfont support... $ECHO_C" >&6
 
 # Check whether --enable-font-switch or --disable-font-switch was given.
@@ -25908,7 +25671,7 @@ else
   use_setfont=no
 
 fi;
-echo "$as_me:25911: result: $use_setfont" >&5
+echo "$as_me:25674: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -25919,7 +25682,7 @@ for ac_prog in $SETFONT consolechars setfont
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:25922: checking for $ac_word" >&5
+echo "$as_me:25685: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_SETFONT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -25936,7 +25699,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_SETFONT="$ac_dir/$ac_word"
-   echo "$as_me:25939: found $ac_dir/$ac_word" >&5
+   echo "$as_me:25702: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -25947,10 +25710,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:25950: result: $SETFONT" >&5
+  echo "$as_me:25713: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:25953: result: no" >&5
+  echo "$as_me:25716: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26018,7 +25781,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:26021: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:25784: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -26035,19 +25798,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me-configure}:26038: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me-configure}:25801: testing Assume $host_os has font-switching ..." 1>&5
 
 		;;
 	*)
 		SETFONT=unknown
 		test -n "$verbose" && echo "	Assume $host_os has no font-switching" 1>&6
 
-echo "${as_me-configure}:26045: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me-configure}:25808: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:26050: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:25813: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 		cat >>confdefs.h <<\EOF
@@ -26057,7 +25820,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26060: checking if you want cgi-link support" >&5
+echo "$as_me:25823: checking if you want cgi-link support" >&5
 echo $ECHO_N "checking if you want cgi-link support... $ECHO_C" >&6
 
 # Check whether --enable-cgi-links or --disable-cgi-links was given.
@@ -26073,10 +25836,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:26076: result: $enableval" >&5
+echo "$as_me:25839: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:26079: checking if you want change-exec support" >&5
+echo "$as_me:25842: checking if you want change-exec support" >&5
 echo $ECHO_N "checking if you want change-exec support... $ECHO_C" >&6
 
 # Check whether --enable-change-exec or --disable-change-exec was given.
@@ -26093,13 +25856,13 @@ else
   use_change_exec=no
 
 fi;
-echo "$as_me:26096: result: $use_change_exec" >&5
+echo "$as_me:25859: result: $use_change_exec" >&5
 echo "${ECHO_T}$use_change_exec" >&6
 test $use_change_exec = yes && cat >>confdefs.h <<\EOF
 #define ENABLE_OPTS_CHANGE_EXEC 1
 EOF
 
-echo "$as_me:26102: checking if you want exec-links support" >&5
+echo "$as_me:25865: checking if you want exec-links support" >&5
 echo $ECHO_N "checking if you want exec-links support... $ECHO_C" >&6
 
 # Check whether --enable-exec-links or --disable-exec-links was given.
@@ -26116,13 +25879,13 @@ else
   use_exec_links=$enableval
 
 fi;
-echo "$as_me:26119: result: $use_exec_links" >&5
+echo "$as_me:25882: result: $use_exec_links" >&5
 echo "${ECHO_T}$use_exec_links" >&6
 test $use_exec_links = yes && cat >>confdefs.h <<\EOF
 #define EXEC_LINKS 1
 EOF
 
-echo "$as_me:26125: checking if you want exec-scripts support" >&5
+echo "$as_me:25888: checking if you want exec-scripts support" >&5
 echo $ECHO_N "checking if you want exec-scripts support... $ECHO_C" >&6
 
 # Check whether --enable-exec-scripts or --disable-exec-scripts was given.
@@ -26139,13 +25902,13 @@ else
   use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:26142: result: $use_exec_scripts" >&5
+echo "$as_me:25905: result: $use_exec_scripts" >&5
 echo "${ECHO_T}$use_exec_scripts" >&6
 test $use_exec_scripts = yes && cat >>confdefs.h <<\EOF
 #define EXEC_SCRIPTS 1
 EOF
 
-echo "$as_me:26148: checking if you want internal-links feature" >&5
+echo "$as_me:25911: checking if you want internal-links feature" >&5
 echo $ECHO_N "checking if you want internal-links feature... $ECHO_C" >&6
 
 # Check whether --enable-internal-links or --disable-internal-links was given.
@@ -26162,13 +25925,13 @@ else
   use_internal_links=no
 
 fi;
-echo "$as_me:26165: result: $use_internal_links" >&5
+echo "$as_me:25928: result: $use_internal_links" >&5
 echo "${ECHO_T}$use_internal_links" >&6
 test $use_internal_links = no && cat >>confdefs.h <<\EOF
 #define DONT_TRACK_INTERNAL_LINKS 1
 EOF
 
-echo "$as_me:26171: checking if you want to fork NSL requests" >&5
+echo "$as_me:25934: checking if you want to fork NSL requests" >&5
 echo $ECHO_N "checking if you want to fork NSL requests... $ECHO_C" >&6
 
 # Check whether --enable-nsl-fork or --disable-nsl-fork was given.
@@ -26185,13 +25948,13 @@ else
   use_nsl_fork=no
 
 fi;
-echo "$as_me:26188: result: $use_nsl_fork" >&5
+echo "$as_me:25951: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 test $use_nsl_fork = yes && cat >>confdefs.h <<\EOF
 #define NSL_FORK 1
 EOF
 
-echo "$as_me:26194: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:25957: checking if you want to log URL requests via syslog" >&5
 echo $ECHO_N "checking if you want to log URL requests via syslog... $ECHO_C" >&6
 
 # Check whether --enable-syslog or --disable-syslog was given.
@@ -26208,13 +25971,13 @@ else
   use_syslog=no
 
 fi;
-echo "$as_me:26211: result: $use_syslog" >&5
+echo "$as_me:25974: result: $use_syslog" >&5
 echo "${ECHO_T}$use_syslog" >&6
 test $use_syslog = yes && cat >>confdefs.h <<\EOF
 #define SYSLOG_REQUESTED_URLS 1
 EOF
 
-echo "$as_me:26217: checking if you want to underline links" >&5
+echo "$as_me:25980: checking if you want to underline links" >&5
 echo $ECHO_N "checking if you want to underline links... $ECHO_C" >&6
 
 # Check whether --enable-underlines or --disable-underlines was given.
@@ -26231,7 +25994,7 @@ else
   use_underline=no
 
 fi;
-echo "$as_me:26234: result: $use_underline" >&5
+echo "$as_me:25997: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 1
@@ -26241,7 +26004,7 @@ test $use_underline = no  && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:26244: checking if help files should be gzip'ed" >&5
+echo "$as_me:26007: checking if help files should be gzip'ed" >&5
 echo $ECHO_N "checking if help files should be gzip'ed... $ECHO_C" >&6
 
 # Check whether --enable-gzip-help or --disable-gzip-help was given.
@@ -26258,10 +26021,10 @@ else
   use_gzip_help=no
 
 fi;
-echo "$as_me:26261: result: $use_gzip_help" >&5
+echo "$as_me:26024: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:26264: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:26027: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
 echo $ECHO_N "checking if you want to use libbz2 for decompression of some bzip2 files... $ECHO_C" >&6
 
 # Check whether --with-bzlib or --without-bzlib was given.
@@ -26271,7 +26034,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:26274: result: $use_bzlib" >&5
+echo "$as_me:26037: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -26310,7 +26073,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 26313 "configure"
+#line 26076 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26322,16 +26085,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26325: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26088: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26328: \$? = $ac_status" >&5
+  echo "$as_me:26091: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26094: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26334: \$? = $ac_status" >&5
+  echo "$as_me:26097: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26348,7 +26111,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:26351: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:26114: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -26389,7 +26152,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 26392 "configure"
+#line 26155 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26401,16 +26164,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26404: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26167: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26407: \$? = $ac_status" >&5
+  echo "$as_me:26170: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26173: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26413: \$? = $ac_status" >&5
+  echo "$as_me:26176: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26427,7 +26190,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:26430: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:26193: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -26443,7 +26206,7 @@ echo "${as_me-configure}:26430: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:26446: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:26209: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -26468,7 +26231,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:26471: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:26234: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -26497,7 +26260,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:26500: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:26263: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -26506,7 +26269,7 @@ echo "${as_me-configure}:26500: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:26509: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:26272: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -26520,10 +26283,10 @@ done
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me-configure}:26523: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:26286: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 26526 "configure"
+#line 26289 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26540,16 +26303,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26543: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26306: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26546: \$? = $ac_status" >&5
+  echo "$as_me:26309: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26549: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26552: \$? = $ac_status" >&5
+  echo "$as_me:26315: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_bz2=yes
 else
@@ -26558,7 +26321,7 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_bz2=no
 
-echo "${as_me-configure}:26561: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:26324: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -26639,11 +26402,11 @@ test -d "$oldincludedir" && {
       if test -d $cf_cv_header_path_bz2 ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_bz2" 1>&6
 
-echo "${as_me-configure}:26642: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me-configure}:26405: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_bz2"
         cat >conftest.$ac_ext <<_ACEOF
-#line 26646 "configure"
+#line 26409 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26660,21 +26423,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26663: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26666: \$? = $ac_status" >&5
+  echo "$as_me:26429: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26672: \$? = $ac_status" >&5
+  echo "$as_me:26435: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found bz2 headers in $cf_cv_header_path_bz2" 1>&6
 
-echo "${as_me-configure}:26677: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me-configure}:26440: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
             cf_cv_find_linkage_bz2=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -26692,7 +26455,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me-configure}:26695: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:26458: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -26700,7 +26463,7 @@ echo "${as_me-configure}:26695: testing Searching for bz2 library in FIND_LINKAG
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lbz2  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 26703 "configure"
+#line 26466 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26717,21 +26480,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26720: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26483: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26723: \$? = $ac_status" >&5
+  echo "$as_me:26486: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26729: \$? = $ac_status" >&5
+  echo "$as_me:26492: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me-configure}:26734: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me-configure}:26497: testing ... found bz2 library in system ..." 1>&5
 
             cf_cv_find_linkage_bz2=yes
 else
@@ -26805,13 +26568,13 @@ test -d "$HOME" && \
           if test -d $cf_cv_library_path_bz2 ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_bz2" 1>&6
 
-echo "${as_me-configure}:26808: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me-configure}:26571: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lbz2  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_bz2"
             cat >conftest.$ac_ext <<_ACEOF
-#line 26814 "configure"
+#line 26577 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26828,21 +26591,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26831: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26594: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26834: \$? = $ac_status" >&5
+  echo "$as_me:26597: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26837: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26600: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26840: \$? = $ac_status" >&5
+  echo "$as_me:26603: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found bz2 library in $cf_cv_library_path_bz2" 1>&6
 
-echo "${as_me-configure}:26845: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me-configure}:26608: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
                 cf_cv_find_linkage_bz2=yes
                 cf_cv_library_file_bz2="-lbz2"
@@ -26897,7 +26660,7 @@ if test -n "$cf_cv_header_path_bz2" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 26900 "configure"
+#line 26663 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26909,16 +26672,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26912: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26675: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26915: \$? = $ac_status" >&5
+  echo "$as_me:26678: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26921: \$? = $ac_status" >&5
+  echo "$as_me:26684: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26935,7 +26698,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:26938: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:26701: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -26969,7 +26732,7 @@ if test -n "$cf_cv_library_path_bz2" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:26972: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:26735: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -26980,7 +26743,7 @@ fi
   LIBS="-lbz2 $LIBS"
 
 else
-{ echo "$as_me:26983: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:26746: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -26990,7 +26753,7 @@ EOF
 
 fi
 
-echo "$as_me:26993: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:26756: checking if you want to use zlib for decompression of some gzip files" >&5
 echo $ECHO_N "checking if you want to use zlib for decompression of some gzip files... $ECHO_C" >&6
 
 # Check whether --with-zlib or --without-zlib was given.
@@ -27000,7 +26763,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:27003: result: $use_zlib" >&5
+echo "$as_me:26766: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -27039,7 +26802,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 27042 "configure"
+#line 26805 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -27051,16 +26814,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27054: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26817: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27057: \$? = $ac_status" >&5
+  echo "$as_me:26820: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27063: \$? = $ac_status" >&5
+  echo "$as_me:26826: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -27077,7 +26840,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:27080: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:26843: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -27118,7 +26881,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 27121 "configure"
+#line 26884 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -27130,16 +26893,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27133: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26896: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27136: \$? = $ac_status" >&5
+  echo "$as_me:26899: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27142: \$? = $ac_status" >&5
+  echo "$as_me:26905: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -27156,7 +26919,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:27159: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:26922: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -27172,7 +26935,7 @@ echo "${as_me-configure}:27159: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:27175: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:26938: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -27197,7 +26960,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:27200: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:26963: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -27226,7 +26989,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:27229: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:26992: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -27235,7 +26998,7 @@ echo "${as_me-configure}:27229: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:27238: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:27001: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -27249,10 +27012,10 @@ done
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me-configure}:27252: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:27015: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27255 "configure"
+#line 27018 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -27268,16 +27031,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27271: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27274: \$? = $ac_status" >&5
+  echo "$as_me:27037: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27280: \$? = $ac_status" >&5
+  echo "$as_me:27043: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_z=yes
 else
@@ -27286,7 +27049,7 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_z=no
 
-echo "${as_me-configure}:27289: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:27052: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -27367,11 +27130,11 @@ test -d "$oldincludedir" && {
       if test -d $cf_cv_header_path_z ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_z" 1>&6
 
-echo "${as_me-configure}:27370: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me-configure}:27133: testing ... testing $cf_cv_header_path_z ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_z"
         cat >conftest.$ac_ext <<_ACEOF
-#line 27374 "configure"
+#line 27137 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -27387,21 +27150,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27390: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27153: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27393: \$? = $ac_status" >&5
+  echo "$as_me:27156: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27399: \$? = $ac_status" >&5
+  echo "$as_me:27162: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found z headers in $cf_cv_header_path_z" 1>&6
 
-echo "${as_me-configure}:27404: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me-configure}:27167: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
             cf_cv_find_linkage_z=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -27419,7 +27182,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me-configure}:27422: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:27185: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -27427,7 +27190,7 @@ echo "${as_me-configure}:27422: testing Searching for z library in FIND_LINKAGE(
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lz  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 27430 "configure"
+#line 27193 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -27443,21 +27206,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27209: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27449: \$? = $ac_status" >&5
+  echo "$as_me:27212: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27215: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27455: \$? = $ac_status" >&5
+  echo "$as_me:27218: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me-configure}:27460: testing ... found z library in system ..." 1>&5
+echo "${as_me-configure}:27223: testing ... found z library in system ..." 1>&5
 
             cf_cv_find_linkage_z=yes
 else
@@ -27531,13 +27294,13 @@ test -d "$HOME" && \
           if test -d $cf_cv_library_path_z ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_z" 1>&6
 
-echo "${as_me-configure}:27534: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me-configure}:27297: testing ... testing $cf_cv_library_path_z ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lz  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_z"
             cat >conftest.$ac_ext <<_ACEOF
-#line 27540 "configure"
+#line 27303 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -27553,21 +27316,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27556: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27559: \$? = $ac_status" >&5
+  echo "$as_me:27322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27565: \$? = $ac_status" >&5
+  echo "$as_me:27328: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found z library in $cf_cv_library_path_z" 1>&6
 
-echo "${as_me-configure}:27570: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me-configure}:27333: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
                 cf_cv_find_linkage_z=yes
                 cf_cv_library_file_z="-lz"
@@ -27622,7 +27385,7 @@ if test -n "$cf_cv_header_path_z" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 27625 "configure"
+#line 27388 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -27634,16 +27397,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27637: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27400: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27640: \$? = $ac_status" >&5
+  echo "$as_me:27403: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27643: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27646: \$? = $ac_status" >&5
+  echo "$as_me:27409: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -27660,7 +27423,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:27663: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:27426: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -27694,7 +27457,7 @@ if test -n "$cf_cv_library_path_z" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:27697: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:27460: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -27705,7 +27468,7 @@ fi
   LIBS="-lz $LIBS"
 
 else
-{ echo "$as_me:27708: WARNING: Cannot find z library" >&5
+{ echo "$as_me:27471: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -27715,7 +27478,7 @@ EOF
 
 fi
 
-echo "$as_me:27718: checking if you want to exclude FINGER code" >&5
+echo "$as_me:27481: checking if you want to exclude FINGER code" >&5
 echo $ECHO_N "checking if you want to exclude FINGER code... $ECHO_C" >&6
 
 # Check whether --enable-finger or --disable-finger was given.
@@ -27732,13 +27495,13 @@ else
   use_finger=no
 
 fi;
-echo "$as_me:27735: result: $use_finger" >&5
+echo "$as_me:27498: result: $use_finger" >&5
 echo "${ECHO_T}$use_finger" >&6
 test $use_finger != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_FINGER 1
 EOF
 
-echo "$as_me:27741: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:27504: checking if you want to exclude GOPHER code" >&5
 echo $ECHO_N "checking if you want to exclude GOPHER code... $ECHO_C" >&6
 
 # Check whether --enable-gopher or --disable-gopher was given.
@@ -27755,13 +27518,13 @@ else
   use_gopher=no
 
 fi;
-echo "$as_me:27758: result: $use_gopher" >&5
+echo "$as_me:27521: result: $use_gopher" >&5
 echo "${ECHO_T}$use_gopher" >&6
 test $use_gopher != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_GOPHER 1
 EOF
 
-echo "$as_me:27764: checking if you want to exclude NEWS code" >&5
+echo "$as_me:27527: checking if you want to exclude NEWS code" >&5
 echo $ECHO_N "checking if you want to exclude NEWS code... $ECHO_C" >&6
 
 # Check whether --enable-news or --disable-news was given.
@@ -27778,13 +27541,13 @@ else
   use_news=no
 
 fi;
-echo "$as_me:27781: result: $use_news" >&5
+echo "$as_me:27544: result: $use_news" >&5
 echo "${ECHO_T}$use_news" >&6
 test $use_news != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_NEWS 1
 EOF
 
-echo "$as_me:27787: checking if you want to exclude FTP code" >&5
+echo "$as_me:27550: checking if you want to exclude FTP code" >&5
 echo $ECHO_N "checking if you want to exclude FTP code... $ECHO_C" >&6
 
 # Check whether --enable-ftp or --disable-ftp was given.
@@ -27801,7 +27564,7 @@ else
   use_ftp=no
 
 fi;
-echo "$as_me:27804: result: $use_ftp" >&5
+echo "$as_me:27567: result: $use_ftp" >&5
 echo "${ECHO_T}$use_ftp" >&6
 test $use_ftp != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_FTP 1
@@ -27809,7 +27572,7 @@ EOF
 
 # All DirEd functions that were enabled on compilation can be disabled
 # or modified at run time via DIRED_MENU symbols in lynx.cfg.
-echo "$as_me:27812: checking if directory-editor code should be used" >&5
+echo "$as_me:27575: checking if directory-editor code should be used" >&5
 echo $ECHO_N "checking if directory-editor code should be used... $ECHO_C" >&6
 
 # Check whether --enable-dired or --disable-dired was given.
@@ -27826,7 +27589,7 @@ else
   use_dired=yes
 
 fi;
-echo "$as_me:27829: result: $use_dired" >&5
+echo "$as_me:27592: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -27835,7 +27598,7 @@ if test ".$use_dired" != ".no" ; then
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:27838: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:27601: checking if you wish to allow extracting from archives via DirEd" >&5
 echo $ECHO_N "checking if you wish to allow extracting from archives via DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-dearchive or --disable-dired-dearchive was given.
@@ -27851,10 +27614,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:27854: result: $enableval" >&5
+	echo "$as_me:27617: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:27857: checking if DirEd mode should override keys" >&5
+	echo "$as_me:27620: checking if DirEd mode should override keys" >&5
 echo $ECHO_N "checking if DirEd mode should override keys... $ECHO_C" >&6
 
 # Check whether --enable-dired-override or --disable-dired-override was given.
@@ -27876,10 +27639,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:27879: result: $enableval" >&5
+	echo "$as_me:27642: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:27882: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:27645: checking if you wish to allow permissions commands via DirEd" >&5
 echo $ECHO_N "checking if you wish to allow permissions commands via DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-permit or --disable-dired-permit was given.
@@ -27901,10 +27664,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:27904: result: $enableval" >&5
+	echo "$as_me:27667: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:27907: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:27670: checking if you wish to allow executable-permission commands via DirEd" >&5
 echo $ECHO_N "checking if you wish to allow executable-permission commands via DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-xpermit or --disable-dired-xpermit was given.
@@ -27920,10 +27683,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:27923: result: $enableval" >&5
+	echo "$as_me:27686: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:27926: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:27689: checking if you wish to allow \"tar\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"tar\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-tar or --disable-dired-tar was given.
@@ -27945,10 +27708,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:27948: result: $enableval" >&5
+	echo "$as_me:27711: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:27951: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:27714: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"uudecode\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-uudecode or --disable-dired-uudecode was given.
@@ -27970,10 +27733,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:27973: result: $enableval" >&5
+	echo "$as_me:27736: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:27976: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:27739: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-zip or --disable-dired-zip was given.
@@ -27995,10 +27758,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:27998: result: $enableval" >&5
+	echo "$as_me:27761: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:28001: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:27764: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-gzip or --disable-dired-gzip was given.
@@ -28020,11 +27783,11 @@ else
 EOF
 
 fi;
-	echo "$as_me:28023: result: $enableval" >&5
+	echo "$as_me:27786: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:28027: checking if you want long-directory listings" >&5
+echo "$as_me:27790: checking if you want long-directory listings" >&5
 echo $ECHO_N "checking if you want long-directory listings... $ECHO_C" >&6
 
 # Check whether --enable-long-list or --disable-long-list was given.
@@ -28046,10 +27809,10 @@ else
 EOF
 
 fi;
-echo "$as_me:28049: result: $enableval" >&5
+echo "$as_me:27812: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:28052: checking if parent-directory references are permitted" >&5
+echo "$as_me:27815: checking if parent-directory references are permitted" >&5
 echo $ECHO_N "checking if parent-directory references are permitted... $ECHO_C" >&6
 
 # Check whether --enable-parent-dir-refs or --disable-parent-dir-refs was given.
@@ -28065,7 +27828,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:28068: result: $enableval" >&5
+echo "$as_me:27831: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -28073,7 +27836,7 @@ for ac_prog in $TELNET telnet
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:28076: checking for $ac_word" >&5
+echo "$as_me:27839: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TELNET+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28090,7 +27853,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TELNET="$ac_dir/$ac_word"
-   echo "$as_me:28093: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27856: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -28101,10 +27864,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:28104: result: $TELNET" >&5
+  echo "$as_me:27867: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:28107: result: no" >&5
+  echo "$as_me:27870: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -28172,7 +27935,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:28175: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:27938: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -28189,7 +27952,7 @@ for ac_prog in $TN3270 tn3270
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:28192: checking for $ac_word" >&5
+echo "$as_me:27955: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TN3270+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28206,7 +27969,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TN3270="$ac_dir/$ac_word"
-   echo "$as_me:28209: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27972: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -28217,10 +27980,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:28220: result: $TN3270" >&5
+  echo "$as_me:27983: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:28223: result: no" >&5
+  echo "$as_me:27986: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -28288,7 +28051,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:28291: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:28054: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -28305,7 +28068,7 @@ for ac_prog in $RLOGIN rlogin
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:28308: checking for $ac_word" >&5
+echo "$as_me:28071: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_RLOGIN+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28322,7 +28085,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_RLOGIN="$ac_dir/$ac_word"
-   echo "$as_me:28325: found $ac_dir/$ac_word" >&5
+   echo "$as_me:28088: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -28333,10 +28096,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:28336: result: $RLOGIN" >&5
+  echo "$as_me:28099: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:28339: result: no" >&5
+  echo "$as_me:28102: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -28404,7 +28167,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:28407: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:28170: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -28421,7 +28184,7 @@ for ac_prog in $MV mv
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:28424: checking for $ac_word" >&5
+echo "$as_me:28187: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MV+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28438,7 +28201,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_MV="$ac_dir/$ac_word"
-   echo "$as_me:28441: found $ac_dir/$ac_word" >&5
+   echo "$as_me:28204: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -28449,10 +28212,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:28452: result: $MV" >&5
+  echo "$as_me:28215: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:28455: result: no" >&5
+  echo "$as_me:28218: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -28520,7 +28283,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:28523: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:28286: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -28537,7 +28300,7 @@ for ac_prog in $GZIP gzip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:28540: checking for $ac_word" >&5
+echo "$as_me:28303: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28554,7 +28317,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GZIP="$ac_dir/$ac_word"
-   echo "$as_me:28557: found $ac_dir/$ac_word" >&5
+   echo "$as_me:28320: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -28565,10 +28328,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:28568: result: $GZIP" >&5
+  echo "$as_me:28331: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:28571: result: no" >&5
+  echo "$as_me:28334: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -28636,7 +28399,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:28639: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:28402: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -28653,7 +28416,7 @@ for ac_prog in $UNCOMPRESS gunzip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:28656: checking for $ac_word" >&5
+echo "$as_me:28419: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_UNCOMPRESS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28670,7 +28433,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_UNCOMPRESS="$ac_dir/$ac_word"
-   echo "$as_me:28673: found $ac_dir/$ac_word" >&5
+   echo "$as_me:28436: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -28681,10 +28444,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:28684: result: $UNCOMPRESS" >&5
+  echo "$as_me:28447: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:28687: result: no" >&5
+  echo "$as_me:28450: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -28752,7 +28515,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:28755: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:28518: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -28769,7 +28532,7 @@ for ac_prog in $UNZIP unzip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:28772: checking for $ac_word" >&5
+echo "$as_me:28535: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_UNZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28786,7 +28549,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_UNZIP="$ac_dir/$ac_word"
-   echo "$as_me:28789: found $ac_dir/$ac_word" >&5
+   echo "$as_me:28552: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -28797,10 +28560,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:28800: result: $UNZIP" >&5
+  echo "$as_me:28563: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:28803: result: no" >&5
+  echo "$as_me:28566: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -28868,7 +28631,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:28871: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:28634: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -28885,7 +28648,7 @@ for ac_prog in $BZIP2 bzip2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:28888: checking for $ac_word" >&5
+echo "$as_me:28651: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_BZIP2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28902,7 +28665,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_BZIP2="$ac_dir/$ac_word"
-   echo "$as_me:28905: found $ac_dir/$ac_word" >&5
+   echo "$as_me:28668: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -28913,10 +28676,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:28916: result: $BZIP2" >&5
+  echo "$as_me:28679: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:28919: result: no" >&5
+  echo "$as_me:28682: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -28984,7 +28747,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:28987: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:28750: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -29001,7 +28764,7 @@ for ac_prog in $TAR tar pax gtar gnutar bsdtar star
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:29004: checking for $ac_word" >&5
+echo "$as_me:28767: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TAR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29018,7 +28781,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TAR="$ac_dir/$ac_word"
-   echo "$as_me:29021: found $ac_dir/$ac_word" >&5
+   echo "$as_me:28784: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29029,10 +28792,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:29032: result: $TAR" >&5
+  echo "$as_me:28795: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:29035: result: no" >&5
+  echo "$as_me:28798: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29100,7 +28863,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29103: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:28866: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -29157,7 +28920,7 @@ for ac_prog in $COMPRESS compress
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:29160: checking for $ac_word" >&5
+echo "$as_me:28923: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_COMPRESS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29174,7 +28937,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_COMPRESS="$ac_dir/$ac_word"
-   echo "$as_me:29177: found $ac_dir/$ac_word" >&5
+   echo "$as_me:28940: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29185,10 +28948,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:29188: result: $COMPRESS" >&5
+  echo "$as_me:28951: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:29191: result: no" >&5
+  echo "$as_me:28954: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29256,7 +29019,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29259: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:29022: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -29273,7 +29036,7 @@ for ac_prog in $RM rm
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:29276: checking for $ac_word" >&5
+echo "$as_me:29039: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_RM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29290,7 +29053,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_RM="$ac_dir/$ac_word"
-   echo "$as_me:29293: found $ac_dir/$ac_word" >&5
+   echo "$as_me:29056: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29301,10 +29064,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:29304: result: $RM" >&5
+  echo "$as_me:29067: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:29307: result: no" >&5
+  echo "$as_me:29070: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29372,7 +29135,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29375: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:29138: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -29389,7 +29152,7 @@ for ac_prog in $UUDECODE uudecode
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:29392: checking for $ac_word" >&5
+echo "$as_me:29155: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_UUDECODE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29406,7 +29169,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_UUDECODE="$ac_dir/$ac_word"
-   echo "$as_me:29409: found $ac_dir/$ac_word" >&5
+   echo "$as_me:29172: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29417,10 +29180,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:29420: result: $UUDECODE" >&5
+  echo "$as_me:29183: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:29423: result: no" >&5
+  echo "$as_me:29186: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29488,7 +29251,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29491: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:29254: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -29505,7 +29268,7 @@ for ac_prog in $ZCAT zcat
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:29508: checking for $ac_word" >&5
+echo "$as_me:29271: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ZCAT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29522,7 +29285,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ZCAT="$ac_dir/$ac_word"
-   echo "$as_me:29525: found $ac_dir/$ac_word" >&5
+   echo "$as_me:29288: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29533,10 +29296,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:29536: result: $ZCAT" >&5
+  echo "$as_me:29299: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:29539: result: no" >&5
+  echo "$as_me:29302: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29604,7 +29367,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29607: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:29370: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -29621,7 +29384,7 @@ for ac_prog in $ZIP zip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:29624: checking for $ac_word" >&5
+echo "$as_me:29387: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29638,7 +29401,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ZIP="$ac_dir/$ac_word"
-   echo "$as_me:29641: found $ac_dir/$ac_word" >&5
+   echo "$as_me:29404: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29649,10 +29412,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:29652: result: $ZIP" >&5
+  echo "$as_me:29415: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:29655: result: no" >&5
+  echo "$as_me:29418: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29720,7 +29483,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29723: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:29486: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -29747,7 +29510,7 @@ for ac_prog in $INSTALL install
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:29750: checking for $ac_word" >&5
+echo "$as_me:29513: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_INSTALL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29764,7 +29527,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INSTALL="$ac_dir/$ac_word"
-   echo "$as_me:29767: found $ac_dir/$ac_word" >&5
+   echo "$as_me:29530: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29775,10 +29538,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:29778: result: $INSTALL" >&5
+  echo "$as_me:29541: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:29781: result: no" >&5
+  echo "$as_me:29544: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29846,7 +29609,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29849: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:29612: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -29872,7 +29635,7 @@ fi
 
 if test $cf_cv_screen = pdcurses ; then
 
-	echo "$as_me:29875: checking for X" >&5
+	echo "$as_me:29638: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -29969,17 +29732,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
-#line 29972 "configure"
+#line 29735 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:29976: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:29739: \"$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:29982: \$? = $ac_status" >&5
+  echo "$as_me:29745: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -30012,7 +29775,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 30015 "configure"
+#line 29778 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -30024,16 +29787,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30027: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29790: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30030: \$? = $ac_status" >&5
+  echo "$as_me:29793: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30036: \$? = $ac_status" >&5
+  echo "$as_me:29799: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -30071,7 +29834,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:30074: result: $have_x" >&5
+  echo "$as_me:29837: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -30081,7 +29844,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:30084: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:29847: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -30105,11 +29868,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:30108: checking whether -R must be followed by a space" >&5
+      echo "$as_me:29871: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
       cat >conftest.$ac_ext <<_ACEOF
-#line 30112 "configure"
+#line 29875 "configure"
 #include "confdefs.h"
 
 int
@@ -30121,16 +29884,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30124: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29887: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30127: \$? = $ac_status" >&5
+  echo "$as_me:29890: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30133: \$? = $ac_status" >&5
+  echo "$as_me:29896: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -30140,13 +29903,13 @@ ac_R_nospace=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-	echo "$as_me:30143: result: no" >&5
+	echo "$as_me:29906: result: no" >&5
 echo "${ECHO_T}no" >&6
 	X_LIBS="$X_LIBS -R$x_libraries"
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 30149 "configure"
+#line 29912 "configure"
 #include "confdefs.h"
 
 int
@@ -30158,16 +29921,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30161: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29924: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30164: \$? = $ac_status" >&5
+  echo "$as_me:29927: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30167: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30170: \$? = $ac_status" >&5
+  echo "$as_me:29933: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -30177,11 +29940,11 @@ ac_R_space=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	if test $ac_R_space = yes; then
-	  echo "$as_me:30180: result: yes" >&5
+	  echo "$as_me:29943: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:30184: result: neither works" >&5
+	  echo "$as_me:29947: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -30201,7 +29964,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >conftest.$ac_ext <<_ACEOF
-#line 30204 "configure"
+#line 29967 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30220,22 +29983,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30223: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29986: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30226: \$? = $ac_status" >&5
+  echo "$as_me:29989: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29992: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30232: \$? = $ac_status" >&5
+  echo "$as_me:29995: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:30238: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:30001: checking for dnet_ntoa in -ldnet" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -30243,7 +30006,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 30246 "configure"
+#line 30009 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30262,16 +30025,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30265: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30028: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30268: \$? = $ac_status" >&5
+  echo "$as_me:30031: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30274: \$? = $ac_status" >&5
+  echo "$as_me:30037: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -30282,14 +30045,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30285: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:30048: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:30292: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:30055: checking for dnet_ntoa in -ldnet_stub" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -30297,7 +30060,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 30300 "configure"
+#line 30063 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30316,16 +30079,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30319: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30082: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30322: \$? = $ac_status" >&5
+  echo "$as_me:30085: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30328: \$? = $ac_status" >&5
+  echo "$as_me:30091: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -30336,7 +30099,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30339: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:30102: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
@@ -30355,13 +30118,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:30358: checking for gethostbyname" >&5
+    echo "$as_me:30121: checking for gethostbyname" >&5
 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 30364 "configure"
+#line 30127 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -30392,16 +30155,16 @@ f = gethostbyname;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30395: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30158: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30398: \$? = $ac_status" >&5
+  echo "$as_me:30161: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30401: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30404: \$? = $ac_status" >&5
+  echo "$as_me:30167: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -30411,11 +30174,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30414: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:30177: result: $ac_cv_func_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:30418: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:30181: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -30423,7 +30186,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 30426 "configure"
+#line 30189 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30442,16 +30205,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30445: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30208: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30448: \$? = $ac_status" >&5
+  echo "$as_me:30211: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30454: \$? = $ac_status" >&5
+  echo "$as_me:30217: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -30462,14 +30225,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30465: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:30228: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-        echo "$as_me:30472: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:30235: checking for gethostbyname in -lbsd" >&5
 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -30477,7 +30240,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 30480 "configure"
+#line 30243 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30496,16 +30259,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30499: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30262: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30502: \$? = $ac_status" >&5
+  echo "$as_me:30265: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30508: \$? = $ac_status" >&5
+  echo "$as_me:30271: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -30516,7 +30279,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30519: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:30282: result: $ac_cv_lib_bsd_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
@@ -30532,13 +30295,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:30535: checking for connect" >&5
+    echo "$as_me:30298: checking for connect" >&5
 echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 30541 "configure"
+#line 30304 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -30569,16 +30332,16 @@ f = connect;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30335: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30575: \$? = $ac_status" >&5
+  echo "$as_me:30338: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30341: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30581: \$? = $ac_status" >&5
+  echo "$as_me:30344: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -30588,11 +30351,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30591: result: $ac_cv_func_connect" >&5
+echo "$as_me:30354: result: $ac_cv_func_connect" >&5
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
-      echo "$as_me:30595: checking for connect in -lsocket" >&5
+      echo "$as_me:30358: checking for connect in -lsocket" >&5
 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -30600,7 +30363,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 30603 "configure"
+#line 30366 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30619,16 +30382,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30622: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30385: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30625: \$? = $ac_status" >&5
+  echo "$as_me:30388: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30631: \$? = $ac_status" >&5
+  echo "$as_me:30394: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -30639,7 +30402,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30642: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:30405: result: $ac_cv_lib_socket_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
@@ -30648,13 +30411,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:30651: checking for remove" >&5
+    echo "$as_me:30414: checking for remove" >&5
 echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 30657 "configure"
+#line 30420 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -30685,16 +30448,16 @@ f = remove;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30688: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30451: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30691: \$? = $ac_status" >&5
+  echo "$as_me:30454: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30457: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30697: \$? = $ac_status" >&5
+  echo "$as_me:30460: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -30704,11 +30467,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30707: result: $ac_cv_func_remove" >&5
+echo "$as_me:30470: result: $ac_cv_func_remove" >&5
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
-      echo "$as_me:30711: checking for remove in -lposix" >&5
+      echo "$as_me:30474: checking for remove in -lposix" >&5
 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -30716,7 +30479,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 30719 "configure"
+#line 30482 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30735,16 +30498,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30738: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30741: \$? = $ac_status" >&5
+  echo "$as_me:30504: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30747: \$? = $ac_status" >&5
+  echo "$as_me:30510: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -30755,7 +30518,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30758: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:30521: result: $ac_cv_lib_posix_remove" >&5
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
@@ -30764,13 +30527,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:30767: checking for shmat" >&5
+    echo "$as_me:30530: checking for shmat" >&5
 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 30773 "configure"
+#line 30536 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -30801,16 +30564,16 @@ f = shmat;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30804: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30567: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30807: \$? = $ac_status" >&5
+  echo "$as_me:30570: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30813: \$? = $ac_status" >&5
+  echo "$as_me:30576: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -30820,11 +30583,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30823: result: $ac_cv_func_shmat" >&5
+echo "$as_me:30586: result: $ac_cv_func_shmat" >&5
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
-      echo "$as_me:30827: checking for shmat in -lipc" >&5
+      echo "$as_me:30590: checking for shmat in -lipc" >&5
 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -30832,7 +30595,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 30835 "configure"
+#line 30598 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30851,16 +30614,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30854: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30617: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30857: \$? = $ac_status" >&5
+  echo "$as_me:30620: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30623: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30863: \$? = $ac_status" >&5
+  echo "$as_me:30626: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -30871,7 +30634,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30874: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:30637: result: $ac_cv_lib_ipc_shmat" >&5
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
@@ -30889,7 +30652,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:30892: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:30655: checking for IceConnectionNumber in -lICE" >&5
 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -30897,7 +30660,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 30900 "configure"
+#line 30663 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30916,16 +30679,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30919: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30682: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30922: \$? = $ac_status" >&5
+  echo "$as_me:30685: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30688: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30928: \$? = $ac_status" >&5
+  echo "$as_me:30691: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -30936,7 +30699,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30939: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:30702: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
@@ -30954,7 +30717,7 @@ LDFLAGS="$X_LIBS $LDFLAGS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:30957: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me-configure}:30720: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -31015,7 +30778,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me-configure}:31018: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me-configure}:30781: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -31023,7 +30786,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me-configure}:31026: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me-configure}:30789: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
 fi
@@ -31031,14 +30794,14 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me-configure}:31034: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me-configure}:30797: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 31041 "configure"
+#line 30804 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31050,16 +30813,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31053: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30816: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31056: \$? = $ac_status" >&5
+  echo "$as_me:30819: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31062: \$? = $ac_status" >&5
+  echo "$as_me:30825: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31067,12 +30830,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:31070: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me-configure}:30833: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me-configure}:31075: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me-configure}:30838: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -31080,13 +30843,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:31083: checking for XOpenDisplay" >&5
+echo "$as_me:30846: checking for XOpenDisplay" >&5
 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
 if test "${ac_cv_func_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 31089 "configure"
+#line 30852 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -31117,16 +30880,16 @@ f = XOpenDisplay;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31120: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30883: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31123: \$? = $ac_status" >&5
+  echo "$as_me:30886: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31129: \$? = $ac_status" >&5
+  echo "$as_me:30892: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -31136,13 +30899,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:31139: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:30902: result: $ac_cv_func_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
 if test $ac_cv_func_XOpenDisplay = yes; then
   :
 else
 
-echo "$as_me:31145: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:30908: checking for XOpenDisplay in -lX11" >&5
 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31150,7 +30913,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31153 "configure"
+#line 30916 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31169,16 +30932,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31172: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30935: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31175: \$? = $ac_status" >&5
+  echo "$as_me:30938: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31178: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31181: \$? = $ac_status" >&5
+  echo "$as_me:30944: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -31189,7 +30952,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31192: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:30955: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
@@ -31197,13 +30960,13 @@ fi
 
 fi
 
-echo "$as_me:31200: checking for XtAppInitialize" >&5
+echo "$as_me:30963: checking for XtAppInitialize" >&5
 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
 if test "${ac_cv_func_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 31206 "configure"
+#line 30969 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -31234,16 +30997,16 @@ f = XtAppInitialize;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31237: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31000: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31240: \$? = $ac_status" >&5
+  echo "$as_me:31003: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31006: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31246: \$? = $ac_status" >&5
+  echo "$as_me:31009: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -31253,13 +31016,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:31256: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:31019: result: $ac_cv_func_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
 if test $ac_cv_func_XtAppInitialize = yes; then
   :
 else
 
-echo "$as_me:31262: checking for XtAppInitialize in -lXt" >&5
+echo "$as_me:31025: checking for XtAppInitialize in -lXt" >&5
 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31267,7 +31030,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31270 "configure"
+#line 31033 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31286,16 +31049,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31289: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31052: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31292: \$? = $ac_status" >&5
+  echo "$as_me:31055: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31295: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31298: \$? = $ac_status" >&5
+  echo "$as_me:31061: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -31306,7 +31069,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31309: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:31072: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
   cat >>confdefs.h <<\EOF
@@ -31320,7 +31083,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:31323: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:31086: WARNING: Unable to successfully link X Toolkit library (-lXt) with
 test program.  You will have to check and add the proper libraries by hand
 to makefile." >&5
 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
@@ -31330,7 +31093,7 @@ fi
 
 cf_x_athena=${cf_x_athena-Xaw}
 
-echo "$as_me:31333: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:31096: checking if you want to link with Xaw 3d library" >&5
 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
 withval=
 
@@ -31341,14 +31104,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:31344: result: yes" >&5
+	echo "$as_me:31107: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:31347: result: no" >&5
+	echo "$as_me:31110: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:31351: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:31114: checking if you want to link with neXT Athena library" >&5
 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
 withval=
 
@@ -31359,14 +31122,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:31362: result: yes" >&5
+	echo "$as_me:31125: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:31365: result: no" >&5
+	echo "$as_me:31128: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:31369: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:31132: checking if you want to link with Athena-Plus library" >&5
 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
 withval=
 
@@ -31377,14 +31140,14 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:31380: result: yes" >&5
+	echo "$as_me:31143: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:31383: result: no" >&5
+	echo "$as_me:31146: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:31387: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:31150: checking for XextCreateExtension in -lXext" >&5
 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31392,7 +31155,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31395 "configure"
+#line 31158 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31411,16 +31174,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31414: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31177: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31417: \$? = $ac_status" >&5
+  echo "$as_me:31180: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31420: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31423: \$? = $ac_status" >&5
+  echo "$as_me:31186: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -31431,7 +31194,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31434: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:31197: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
   LIBS="-lXext $LIBS"
@@ -31453,14 +31216,14 @@ do
 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
 			CPPFLAGS="-I$cf_path/include $cf_save"
-			echo "$as_me:31456: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:31219: checking for $cf_test in $cf_path" >&5
 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
 		else
-			echo "$as_me:31459: checking for $cf_test" >&5
+			echo "$as_me:31222: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 31463 "configure"
+#line 31226 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -31474,16 +31237,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31477: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31240: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31480: \$? = $ac_status" >&5
+  echo "$as_me:31243: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31486: \$? = $ac_status" >&5
+  echo "$as_me:31249: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -31492,7 +31255,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:31495: result: $cf_result" >&5
+		echo "$as_me:31258: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_include=$cf_path
@@ -31504,7 +31267,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_include" ; then
-	{ echo "$as_me:31507: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:31270: WARNING: Unable to successfully find Athena header files with test program" >&5
 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
 elif test "$cf_x_athena_include" != default ; then
 	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include"
@@ -31529,15 +31292,15 @@ do
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
-				echo "$as_me:31532: checking for $cf_lib in $cf_path" >&5
+				echo "$as_me:31295: checking for $cf_lib in $cf_path" >&5
 echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6
 			else
 				LIBS="$cf_lib $LIBS"
-				echo "$as_me:31536: checking for $cf_test in $cf_lib" >&5
+				echo "$as_me:31299: checking for $cf_test in $cf_lib" >&5
 echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6
 			fi
 			cat >conftest.$ac_ext <<_ACEOF
-#line 31540 "configure"
+#line 31303 "configure"
 #include "confdefs.h"
 
 int
@@ -31549,16 +31312,16 @@ $cf_test()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31552: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31315: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31555: \$? = $ac_status" >&5
+  echo "$as_me:31318: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31561: \$? = $ac_status" >&5
+  echo "$as_me:31324: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -31567,7 +31330,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:31570: result: $cf_result" >&5
+			echo "$as_me:31333: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
@@ -31579,7 +31342,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:31582: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:31345: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -31594,7 +31357,7 @@ for ac_prog in xcurses-config
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:31597: checking for $ac_word" >&5
+echo "$as_me:31360: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31611,7 +31374,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_XCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:31614: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31377: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31622,10 +31385,10 @@ fi
 XCURSES_CONFIG=$ac_cv_path_XCURSES_CONFIG
 
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:31625: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:31388: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:31628: result: no" >&5
+  echo "$as_me:31391: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31646,7 +31409,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:31649: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me-configure}:31412: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -31707,7 +31470,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me-configure}:31710: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me-configure}:31473: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -31715,7 +31478,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me-configure}:31718: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me-configure}:31481: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
 fi
@@ -31723,14 +31486,14 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me-configure}:31726: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me-configure}:31489: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 31733 "configure"
+#line 31496 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31742,16 +31505,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31745: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31508: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31748: \$? = $ac_status" >&5
+  echo "$as_me:31511: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31754: \$? = $ac_status" >&5
+  echo "$as_me:31517: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31759,12 +31522,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:31762: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me-configure}:31525: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me-configure}:31767: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me-configure}:31530: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -31772,7 +31535,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:31775: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:31538: checking for XOpenDisplay in -lX11" >&5
 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31780,7 +31543,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31783 "configure"
+#line 31546 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31799,16 +31562,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31802: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31565: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31805: \$? = $ac_status" >&5
+  echo "$as_me:31568: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31571: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31811: \$? = $ac_status" >&5
+  echo "$as_me:31574: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -31819,13 +31582,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31822: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:31585: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
 fi
 
-echo "$as_me:31828: checking for XCurses library" >&5
+echo "$as_me:31591: checking for XCurses library" >&5
 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
 if test "${cf_cv_lib_XCurses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31833,7 +31596,7 @@ else
 
 LIBS="-lXCurses $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31836 "configure"
+#line 31599 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -31848,16 +31611,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31851: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31614: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31854: \$? = $ac_status" >&5
+  echo "$as_me:31617: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31860: \$? = $ac_status" >&5
+  echo "$as_me:31623: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -31868,7 +31631,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31871: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:31634: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -31887,14 +31650,14 @@ EOF
 EOF
 
 else
-	{ { echo "$as_me:31890: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:31653: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
 
-echo "$as_me:31897: checking if we can include termio.h with curses" >&5
+echo "$as_me:31660: checking if we can include termio.h with curses" >&5
 echo $ECHO_N "checking if we can include termio.h with curses... $ECHO_C" >&6
 if test "${cf_cv_termio_and_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31904,7 +31667,7 @@ else
     CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir-.} -I${srcdir-.}/src -I${srcdir-.}/WWW/Library/Implementation"
     touch lynx_cfg.h
     cat >conftest.$ac_ext <<_ACEOF
-#line 31907 "configure"
+#line 31670 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -31918,16 +31681,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31921: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31684: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31924: \$? = $ac_status" >&5
+  echo "$as_me:31687: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31930: \$? = $ac_status" >&5
+  echo "$as_me:31693: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -31940,7 +31703,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:31943: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:31706: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test $cf_cv_termio_and_curses = yes && cat >>confdefs.h <<\EOF
@@ -31955,23 +31718,23 @@ if test $cf_cv_screen != slang ; then
 for ac_header in $cf_cv_screen/term.h term.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:31958: checking for $ac_header" >&5
+echo "$as_me:31721: 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 31964 "configure"
+#line 31727 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31968: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:31731: \"$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:31974: \$? = $ac_status" >&5
+  echo "$as_me:31737: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31990,7 +31753,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:31993: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:31756: 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
@@ -32000,7 +31763,7 @@ EOF
 fi
 done
 
-echo "$as_me:32003: checking if curses supports alternate-character set" >&5
+echo "$as_me:31766: checking if curses supports alternate-character set" >&5
 echo $ECHO_N "checking if curses supports alternate-character set... $ECHO_C" >&6
 if test "${cf_cv_alt_char_set+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -32009,7 +31772,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 32012 "configure"
+#line 31775 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -32023,16 +31786,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32026: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32029: \$? = $ac_status" >&5
+  echo "$as_me:31792: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32035: \$? = $ac_status" >&5
+  echo "$as_me:31798: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -32046,20 +31809,20 @@ done
 
 fi
 
-echo "$as_me:32049: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:31812: result: $cf_cv_alt_char_set" >&5
 echo "${ECHO_T}$cf_cv_alt_char_set" >&6
 test $cf_cv_alt_char_set != no && cat >>confdefs.h <<EOF
 #define ALT_CHAR_SET $cf_cv_alt_char_set
 EOF
 
-echo "$as_me:32055: checking if curses supports fancy attributes" >&5
+echo "$as_me:31818: checking if curses supports fancy attributes" >&5
 echo $ECHO_N "checking if curses supports fancy attributes... $ECHO_C" >&6
 if test "${cf_cv_fancy_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 32062 "configure"
+#line 31825 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -32077,16 +31840,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32080: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31843: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32083: \$? = $ac_status" >&5
+  echo "$as_me:31846: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32089: \$? = $ac_status" >&5
+  echo "$as_me:31852: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -32098,13 +31861,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:32101: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:31864: result: $cf_cv_fancy_curses" >&5
 echo "${ECHO_T}$cf_cv_fancy_curses" >&6
 test $cf_cv_fancy_curses = yes && cat >>confdefs.h <<\EOF
 #define FANCY_CURSES 1
 EOF
 
-echo "$as_me:32107: checking for function curses_version" >&5
+echo "$as_me:31870: checking for function curses_version" >&5
 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
 if test "${cf_cv_func_curses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -32114,7 +31877,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 32117 "configure"
+#line 31880 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -32127,15 +31890,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:32130: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31893: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32133: \$? = $ac_status" >&5
+  echo "$as_me:31896: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:32135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31898: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32138: \$? = $ac_status" >&5
+  echo "$as_me:31901: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -32150,21 +31913,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:32153: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:31916: result: $cf_cv_func_curses_version" >&5
 echo "${ECHO_T}$cf_cv_func_curses_version" >&6
 test "$cf_cv_func_curses_version" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_CURSES_VERSION 1
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:32160: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:31923: checking for obsolete/broken version of ncurses" >&5
 echo $ECHO_N "checking for obsolete/broken version of ncurses... $ECHO_C" >&6
 if test "${cf_cv_ncurses_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32167 "configure"
+#line 31930 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -32183,16 +31946,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32186: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31949: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32189: \$? = $ac_status" >&5
+  echo "$as_me:31952: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32192: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31955: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32195: \$? = $ac_status" >&5
+  echo "$as_me:31958: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -32204,10 +31967,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:32207: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:31970: result: $cf_cv_ncurses_broken" >&5
 echo "${ECHO_T}$cf_cv_ncurses_broken" >&6
 if test "$cf_cv_ncurses_broken" = yes ; then
-	{ echo "$as_me:32210: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:31973: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
 echo "$as_me: WARNING: hmm... you should get an up-to-date version of ncurses" >&2;}
 	cat >>confdefs.h <<\EOF
 #define NCURSES_BROKEN 1
@@ -32216,14 +31979,14 @@ EOF
 fi
 fi
 
-echo "$as_me:32219: checking if curses supports color attributes" >&5
+echo "$as_me:31982: checking if curses supports color attributes" >&5
 echo $ECHO_N "checking if curses supports color attributes... $ECHO_C" >&6
 if test "${cf_cv_color_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 32226 "configure"
+#line 31989 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -32243,16 +32006,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32246: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32009: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32249: \$? = $ac_status" >&5
+  echo "$as_me:32012: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32015: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32255: \$? = $ac_status" >&5
+  echo "$as_me:32018: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -32264,7 +32027,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:32267: result: $cf_cv_color_curses" >&5
+echo "$as_me:32030: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test $cf_cv_color_curses = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -32284,23 +32047,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:32287: checking for $ac_header" >&5
+echo "$as_me:32050: 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 32293 "configure"
+#line 32056 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:32297: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:32060: \"$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:32303: \$? = $ac_status" >&5
+  echo "$as_me:32066: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -32319,7 +32082,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:32322: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:32085: 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
@@ -32334,23 +32097,23 @@ if test "$ISC" = yes ; then
 for ac_header in sys/termio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:32337: checking for $ac_header" >&5
+echo "$as_me:32100: 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 32343 "configure"
+#line 32106 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:32347: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:32110: \"$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:32353: \$? = $ac_status" >&5
+  echo "$as_me:32116: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -32369,7 +32132,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:32372: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:32135: 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
@@ -32387,10 +32150,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:32390: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:32153: checking whether termios.h needs _POSIX_SOURCE" >&5
 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 32393 "configure"
+#line 32156 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -32402,16 +32165,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32405: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32168: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32408: \$? = $ac_status" >&5
+  echo "$as_me:32171: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32414: \$? = $ac_status" >&5
+  echo "$as_me:32177: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -32419,7 +32182,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 32422 "configure"
+#line 32185 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -32433,16 +32196,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32436: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32199: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32439: \$? = $ac_status" >&5
+  echo "$as_me:32202: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32445: \$? = $ac_status" >&5
+  echo "$as_me:32208: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -32457,12 +32220,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:32460: result: $termios_bad" >&5
+	echo "$as_me:32223: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:32465: checking declaration of size-change" >&5
+echo "$as_me:32228: checking declaration of size-change" >&5
 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
 if test "${cf_cv_sizechange+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -32477,7 +32240,7 @@ do
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 32480 "configure"
+#line 32243 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -32521,16 +32284,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32524: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32287: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32527: \$? = $ac_status" >&5
+  echo "$as_me:32290: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32533: \$? = $ac_status" >&5
+  echo "$as_me:32296: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -32549,7 +32312,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:32552: result: $cf_cv_sizechange" >&5
+echo "$as_me:32315: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 	cat >>confdefs.h <<\EOF
@@ -32566,14 +32329,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:32569: checking if ttytype is declared in curses library" >&5
+echo "$as_me:32332: checking if ttytype is declared in curses library" >&5
 echo $ECHO_N "checking if ttytype is declared in curses library... $ECHO_C" >&6
 if test "${cf_cv_have_ttytype+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 32576 "configure"
+#line 32339 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -32585,16 +32348,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32588: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32351: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32591: \$? = $ac_status" >&5
+  echo "$as_me:32354: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32597: \$? = $ac_status" >&5
+  echo "$as_me:32360: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -32606,7 +32369,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:32609: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:32372: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test $cf_cv_have_ttytype = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TTYTYPE 1
@@ -32614,14 +32377,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:32617: checking if curses supports wide characters" >&5
+echo "$as_me:32380: checking if curses supports wide characters" >&5
 echo $ECHO_N "checking if curses supports wide characters... $ECHO_C" >&6
 if test "${cf_cv_widec_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32624 "configure"
+#line 32387 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32640,16 +32403,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32643: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32406: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32646: \$? = $ac_status" >&5
+  echo "$as_me:32409: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32652: \$? = $ac_status" >&5
+  echo "$as_me:32415: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -32660,7 +32423,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:32663: result: $cf_cv_widec_curses" >&5
+echo "$as_me:32426: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -32669,14 +32432,14 @@ if test "$cf_cv_widec_curses" = yes ; then
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:32672: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:32435: checking if we must include wchar.h to declare mbstate_t" >&5
 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
 if test "${cf_cv_widec_mbstate+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 32679 "configure"
+#line 32442 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32690,23 +32453,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32693: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32456: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32696: \$? = $ac_status" >&5
+  echo "$as_me:32459: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32702: \$? = $ac_status" >&5
+  echo "$as_me:32465: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 32709 "configure"
+#line 32472 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32721,16 +32484,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32724: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32487: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32727: \$? = $ac_status" >&5
+  echo "$as_me:32490: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32730: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32733: \$? = $ac_status" >&5
+  echo "$as_me:32496: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -32742,7 +32505,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:32745: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:32508: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -32763,14 +32526,14 @@ fi
 
 	fi
 
-echo "$as_me:32766: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:32529: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32773 "configure"
+#line 32536 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32787,23 +32550,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32790: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32553: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32793: \$? = $ac_status" >&5
+  echo "$as_me:32556: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32799: \$? = $ac_status" >&5
+  echo "$as_me:32562: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 32806 "configure"
+#line 32569 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -32821,16 +32584,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32824: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32587: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32827: \$? = $ac_status" >&5
+  echo "$as_me:32590: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32593: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32833: \$? = $ac_status" >&5
+  echo "$as_me:32596: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -32842,11 +32605,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:32845: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:32608: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 
-echo "$as_me:32849: checking for term.h" >&5
+echo "$as_me:32612: checking for term.h" >&5
 echo $ECHO_N "checking for term.h... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -32859,7 +32622,7 @@ for cf_header in \
 	term.h
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 32862 "configure"
+#line 32625 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -32873,16 +32636,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32876: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32639: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32879: \$? = $ac_status" >&5
+  echo "$as_me:32642: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32885: \$? = $ac_status" >&5
+  echo "$as_me:32648: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -32895,7 +32658,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:32898: result: $cf_cv_term_header" >&5
+echo "$as_me:32661: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -32946,10 +32709,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:32949: checking for ${cf_func}" >&5
+	echo "$as_me:32712: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me-configure}:32952: testing ${cf_func} ..." 1>&5
+echo "${as_me-configure}:32715: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -32958,7 +32721,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 32961 "configure"
+#line 32724 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -32992,16 +32755,16 @@ ${cf_cv_main_return-return}(foo == 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32995: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32998: \$? = $ac_status" >&5
+  echo "$as_me:32761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33004: \$? = $ac_status" >&5
+  echo "$as_me:32767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -33017,7 +32780,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:33020: result: $cf_result" >&5
+	echo "$as_me:32783: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -33033,13 +32796,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:33036: checking for $ac_func" >&5
+echo "$as_me:32799: 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 33042 "configure"
+#line 32805 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -33070,16 +32833,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33073: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32836: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33076: \$? = $ac_status" >&5
+  echo "$as_me:32839: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32842: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33082: \$? = $ac_status" >&5
+  echo "$as_me:32845: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -33089,7 +32852,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:33092: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:32855: 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
@@ -33103,12 +32866,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:33106: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:32869: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 	if test $cf_cv_screen = slang ; then
-		{ { echo "$as_me:33111: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:32874: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33116,7 +32879,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:33119: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:32882: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 		cat >>confdefs.h <<\EOF
@@ -33221,7 +32984,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:33224: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:32987: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -33397,7 +33160,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:33400: error: ambiguous option: $1
+    { { echo "$as_me:33163: 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;}
@@ -33416,7 +33179,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:33419: error: unrecognized option: $1
+  -*) { { echo "$as_me:33182: 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;}
@@ -33469,7 +33232,7 @@ do
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "$CONFIG_H" ) CONFIG_HEADERS="$CONFIG_HEADERS $CONFIG_H:config.hin" ;;
-  *) { { echo "$as_me:33472: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:33235: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -33786,7 +33549,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:33789: creating $ac_file" >&5
+    { echo "$as_me:33552: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -33804,7 +33567,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:33807: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:33570: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -33817,7 +33580,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:33820: error: cannot find input file: $f" >&5
+           { { echo "$as_me:33583: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -33883,7 +33646,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:33886: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:33649: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -33894,7 +33657,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:33897: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:33660: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -33907,7 +33670,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:33910: error: cannot find input file: $f" >&5
+           { { echo "$as_me:33673: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -34025,7 +33788,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:34028: $ac_file is unchanged" >&5
+      { echo "$as_me:33791: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \