about summary refs log tree commit diff stats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6067
1 files changed, 3247 insertions, 2820 deletions
diff --git a/configure b/configure
index 721332fb..8bd7321f 100755
--- a/configure
+++ b/configure
@@ -705,6 +705,7 @@ Basic Configuration Options:
   --disable-included-msgs use included messages, for i18n support
   --with-nls-datadir=DIR  NLS data, parent of locale (default: PREFIX/DATADIR)
   --disable-full-paths    control whether full utility pathnames are used
+  --with-nss-compat{=path}       link with nss_compat library if available
   --with-ssl{=path}       link with ssl library if available
   --with-gnutls{=path}    link with gnutls support
   --with-socks{=path}     link with socks library if available
@@ -978,7 +979,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:981: loading site script $ac_site_file" >&5
+    { echo "$as_me:982: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
@@ -989,7 +990,7 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:992: loading cache $cache_file" >&5
+    { echo "$as_me:993: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -997,7 +998,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:1000: creating cache $cache_file" >&5
+  { echo "$as_me:1001: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1013,21 +1014,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:1016: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:1017: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:1020: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:1021: error: \`$ac_var' was not set in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:1026: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:1027: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:1028:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1029:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:1030:   current value: $ac_new_val" >&5
+        { echo "$as_me:1031:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1046,9 +1047,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:1049: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1050: error: changes in the environment can compromise the build" >&5
 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:1051: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1052: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1069,10 +1070,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1072: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1073: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1075: \$? = $ac_status" >&5
+  echo "$as_me:1076: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_path_separator=';'
 else
@@ -1107,7 +1108,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1110: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1111: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1117,11 +1118,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1120: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1121: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1124: checking build system type" >&5
+echo "$as_me:1125: checking build system type" >&5
 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1130,23 +1131,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1133: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1134: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:1137: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1138: error: $ac_config_sub $ac_cv_build_alias failed." >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1142: result: $ac_cv_build" >&5
+echo "$as_me:1143: result: $ac_cv_build" >&5
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-echo "$as_me:1149: checking host system type" >&5
+echo "$as_me:1150: checking host system type" >&5
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1155,12 +1156,12 @@ else
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:1158: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1159: error: $ac_config_sub $ac_cv_host_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1163: result: $ac_cv_host" >&5
+echo "$as_me:1164: result: $ac_cv_host" >&5
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1168,7 +1169,7 @@ host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
-	echo "$as_me:1171: checking target system type" >&5
+	echo "$as_me:1172: checking target system type" >&5
 echo $ECHO_N "checking target system type... $ECHO_C" >&6
 if test "${ac_cv_target+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1177,12 +1178,12 @@ else
 test "x$ac_cv_target_alias" = "x" &&
   ac_cv_target_alias=$ac_cv_host_alias
 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:1180: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1181: error: $ac_config_sub $ac_cv_target_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1185: result: $ac_cv_target" >&5
+echo "$as_me:1186: result: $ac_cv_target" >&5
 echo "${ECHO_T}$ac_cv_target" >&6
 target=$ac_cv_target
 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1213,13 +1214,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1216: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1217: result: Configuring for $cf_cv_system_name" >&5
 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
 
 if test ".$system_name" != ".$cf_cv_system_name" ; then
-	echo "$as_me:1220: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1221: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
-	{ { echo "$as_me:1222: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1223: error: \"Please remove config.cache and try again.\"" >&5
 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1227,7 +1228,7 @@ fi
 # Check whether --with-system-type or --without-system-type was given.
 if test "${with_system_type+set}" = set; then
   withval="$with_system_type"
-  { echo "$as_me:1230: WARNING: overriding system type $host_os to $withval" >&5
+  { echo "$as_me:1231: WARNING: overriding system type $host_os to $withval" >&5
 echo "$as_me: WARNING: overriding system type $host_os to $withval" >&2;}
  host_os=$withval
 fi;
@@ -1236,7 +1237,7 @@ PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
 VERSION=2.8.7dev.7
 
-echo "$as_me:1239: checking for DESTDIR" >&5
+echo "$as_me:1240: checking for DESTDIR" >&5
 echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6
 
 # Check whether --with-destdir or --without-destdir was given.
@@ -1272,7 +1273,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:1275: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:1276: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -1281,7 +1282,7 @@ esac
 fi
 DESTDIR="$withval"
 
-echo "$as_me:1284: result: $DESTDIR" >&5
+echo "$as_me:1285: result: $DESTDIR" >&5
 echo "${ECHO_T}$DESTDIR" >&6
 
 case $host_os in
@@ -1300,7 +1301,7 @@ ac_main_return=return
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1303: checking for $ac_word" >&5
+echo "$as_me:1304: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1315,7 +1316,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1318: found $ac_dir/$ac_word" >&5
+echo "$as_me:1319: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1323,10 +1324,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1326: result: $CC" >&5
+  echo "$as_me:1327: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1329: result: no" >&5
+  echo "$as_me:1330: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1335,7 +1336,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1338: checking for $ac_word" >&5
+echo "$as_me:1339: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1350,7 +1351,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1353: found $ac_dir/$ac_word" >&5
+echo "$as_me:1354: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1358,10 +1359,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1361: result: $ac_ct_CC" >&5
+  echo "$as_me:1362: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1364: result: no" >&5
+  echo "$as_me:1365: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1374,7 +1375,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1377: checking for $ac_word" >&5
+echo "$as_me:1378: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1389,7 +1390,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1392: found $ac_dir/$ac_word" >&5
+echo "$as_me:1393: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1397,10 +1398,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1400: result: $CC" >&5
+  echo "$as_me:1401: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1403: result: no" >&5
+  echo "$as_me:1404: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1409,7 +1410,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1412: checking for $ac_word" >&5
+echo "$as_me:1413: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1424,7 +1425,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1427: found $ac_dir/$ac_word" >&5
+echo "$as_me:1428: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1432,10 +1433,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1435: result: $ac_ct_CC" >&5
+  echo "$as_me:1436: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1438: result: no" >&5
+  echo "$as_me:1439: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1448,7 +1449,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1451: checking for $ac_word" >&5
+echo "$as_me:1452: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1468,7 +1469,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1471: found $ac_dir/$ac_word" >&5
+echo "$as_me:1472: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1490,10 +1491,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1493: result: $CC" >&5
+  echo "$as_me:1494: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1496: result: no" >&5
+  echo "$as_me:1497: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1504,7 +1505,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1507: checking for $ac_word" >&5
+echo "$as_me:1508: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1519,7 +1520,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1522: found $ac_dir/$ac_word" >&5
+echo "$as_me:1523: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1527,10 +1528,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1530: result: $CC" >&5
+  echo "$as_me:1531: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1533: result: no" >&5
+  echo "$as_me:1534: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1543,7 +1544,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1546: checking for $ac_word" >&5
+echo "$as_me:1547: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1558,7 +1559,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1561: found $ac_dir/$ac_word" >&5
+echo "$as_me:1562: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1566,10 +1567,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1569: result: $ac_ct_CC" >&5
+  echo "$as_me:1570: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1572: result: no" >&5
+  echo "$as_me:1573: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1581,32 +1582,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1584: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1585: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:1589:" \
+echo "$as_me:1590:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1592: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1593: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1595: \$? = $ac_status" >&5
+  echo "$as_me:1596: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1597: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1598: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1600: \$? = $ac_status" >&5
+  echo "$as_me:1601: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1602: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1603: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1605: \$? = $ac_status" >&5
+  echo "$as_me:1606: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1609 "configure"
+#line 1610 "configure"
 #include "confdefs.h"
 
 int
@@ -1622,13 +1623,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1625: checking for C compiler default output" >&5
+echo "$as_me:1626: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1628: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1629: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1631: \$? = $ac_status" >&5
+  echo "$as_me:1632: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -1651,34 +1652,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1654: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1655: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1660: result: $ac_file" >&5
+echo "$as_me:1661: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1665: checking whether the C compiler works" >&5
+echo "$as_me:1666: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:1671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1672: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1674: \$? = $ac_status" >&5
+  echo "$as_me:1675: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1681: error: cannot run C compiled programs.
+	{ { echo "$as_me:1682: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -1686,24 +1687,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1689: result: yes" >&5
+echo "$as_me:1690: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1696: checking whether we are cross compiling" >&5
+echo "$as_me:1697: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1698: result: $cross_compiling" >&5
+echo "$as_me:1699: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1701: checking for executable suffix" >&5
+echo "$as_me:1702: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1704: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1706: \$? = $ac_status" >&5
+  echo "$as_me:1707: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1719,25 +1720,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1722: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1723: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:1728: result: $ac_cv_exeext" >&5
+echo "$as_me:1729: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:1734: checking for object suffix" >&5
+echo "$as_me:1735: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1740 "configure"
+#line 1741 "configure"
 #include "confdefs.h"
 
 int
@@ -1749,10 +1750,10 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1752: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1753: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1755: \$? = $ac_status" >&5
+  echo "$as_me:1756: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
@@ -1764,24 +1765,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1767: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1768: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:1774: result: $ac_cv_objext" >&5
+echo "$as_me:1775: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1778: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1779: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1784 "configure"
+#line 1785 "configure"
 #include "confdefs.h"
 
 int
@@ -1796,16 +1797,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1799: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1800: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1802: \$? = $ac_status" >&5
+  echo "$as_me:1803: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1806: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1808: \$? = $ac_status" >&5
+  echo "$as_me:1809: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1817,19 +1818,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1820: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1821: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:1826: checking whether $CC accepts -g" >&5
+echo "$as_me:1827: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1832 "configure"
+#line 1833 "configure"
 #include "confdefs.h"
 
 int
@@ -1841,16 +1842,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1844: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1845: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1847: \$? = $ac_status" >&5
+  echo "$as_me:1848: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1853: \$? = $ac_status" >&5
+  echo "$as_me:1854: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1860,7 +1861,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1863: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1864: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -1887,16 +1888,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1890: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1891: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1893: \$? = $ac_status" >&5
+  echo "$as_me:1894: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1899: \$? = $ac_status" >&5
+  echo "$as_me:1900: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -1908,7 +1909,7 @@ if { (eval echo "$as_me:1890: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1911 "configure"
+#line 1912 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1921,16 +1922,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1924: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1925: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1927: \$? = $ac_status" >&5
+  echo "$as_me:1928: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1931: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1933: \$? = $ac_status" >&5
+  echo "$as_me:1934: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -1940,7 +1941,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 1943 "configure"
+#line 1944 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1952,16 +1953,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1955: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1956: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1958: \$? = $ac_status" >&5
+  echo "$as_me:1959: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1962: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1964: \$? = $ac_status" >&5
+  echo "$as_me:1965: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -1995,7 +1996,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
-echo "$as_me:1998: checking how to run the C preprocessor" >&5
+echo "$as_me:1999: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -2016,18 +2017,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2019 "configure"
+#line 2020 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2024: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2025: \"$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:2030: \$? = $ac_status" >&5
+  echo "$as_me:2031: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2050,17 +2051,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2053 "configure"
+#line 2054 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2057: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2058: \"$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:2063: \$? = $ac_status" >&5
+  echo "$as_me:2064: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2097,7 +2098,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2100: result: $CPP" >&5
+echo "$as_me:2101: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2107,18 +2108,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2110 "configure"
+#line 2111 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2115: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2116: \"$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:2121: \$? = $ac_status" >&5
+  echo "$as_me:2122: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2141,17 +2142,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2144 "configure"
+#line 2145 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2148: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2149: \"$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:2154: \$? = $ac_status" >&5
+  echo "$as_me:2155: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2179,7 +2180,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2182: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2183: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2191,18 +2192,18 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 
-echo "$as_me:2194: checking whether ln -s works" >&5
+echo "$as_me:2195: checking whether ln -s works" >&5
 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:2198: result: yes" >&5
+  echo "$as_me:2199: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2201: result: no, using $LN_S" >&5
+  echo "$as_me:2202: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:2205: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2206: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -2222,11 +2223,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:2225: result: yes" >&5
+  echo "$as_me:2226: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:2229: result: no" >&5
+  echo "$as_me:2230: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2243,7 +2244,7 @@ fi
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:2246: checking for a BSD compatible install" >&5
+echo "$as_me:2247: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -2292,7 +2293,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2295: result: $INSTALL" >&5
+echo "$as_me:2296: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2307,7 +2308,7 @@ for ac_prog in lint alint lclint tdlint
 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:2310: checking for $ac_word" >&5
+echo "$as_me:2311: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LINT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2322,7 +2323,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:2325: found $ac_dir/$ac_word" >&5
+echo "$as_me:2326: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2330,20 +2331,20 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:2333: result: $LINT" >&5
+  echo "$as_me:2334: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:2336: result: no" >&5
+  echo "$as_me:2337: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$LINT" && break
 done
 
-echo "$as_me:2343: checking for AIX" >&5
+echo "$as_me:2344: checking for AIX" >&5
 echo $ECHO_N "checking for AIX... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 2346 "configure"
+#line 2347 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2352,24 +2353,24 @@ cat >conftest.$ac_ext <<_ACEOF
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
-  echo "$as_me:2355: result: yes" >&5
+  echo "$as_me:2356: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 cat >>confdefs.h <<\EOF
 #define _ALL_SOURCE 1
 EOF
 
 else
-  echo "$as_me:2362: result: no" >&5
+  echo "$as_me:2363: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest*
 
-echo "$as_me:2367: checking for POSIXized ISC" >&5
+echo "$as_me:2368: checking for POSIXized ISC" >&5
 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
 if test -d /etc/conf/kconfig.d &&
    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
-  echo "$as_me:2372: result: yes" >&5
+  echo "$as_me:2373: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   ISC=yes # If later tests want to check for ISC.
 
@@ -2383,7 +2384,7 @@ EOF
     CC="$CC -Xp"
   fi
 else
-  echo "$as_me:2386: result: no" >&5
+  echo "$as_me:2387: result: no" >&5
 echo "${ECHO_T}no" >&6
   ISC=
 fi
@@ -2424,7 +2425,7 @@ else
 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:2427: checking for $ac_word" >&5
+echo "$as_me:2428: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_BUILD_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2439,7 +2440,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:2442: found $ac_dir/$ac_word" >&5
+echo "$as_me:2443: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2447,10 +2448,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:2450: result: $BUILD_CC" >&5
+  echo "$as_me:2451: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:2453: result: no" >&5
+  echo "$as_me:2454: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2458,12 +2459,12 @@ fi
 done
 
 fi;
-	echo "$as_me:2461: checking for native build C compiler" >&5
+	echo "$as_me:2462: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:2463: result: $BUILD_CC" >&5
+	echo "$as_me:2464: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:2466: checking for native build C preprocessor" >&5
+	echo "$as_me:2467: checking for native build C preprocessor" >&5
 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
 
 # Check whether --with-build-cpp or --without-build-cpp was given.
@@ -2473,10 +2474,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:2476: result: $BUILD_CPP" >&5
+	echo "$as_me:2477: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:2479: checking for native build C flags" >&5
+	echo "$as_me:2480: checking for native build C flags" >&5
 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
 
 # Check whether --with-build-cflags or --without-build-cflags was given.
@@ -2484,10 +2485,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:2487: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:2488: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:2490: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:2491: checking for native build C preprocessor-flags" >&5
 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
 
 # Check whether --with-build-cppflags or --without-build-cppflags was given.
@@ -2495,10 +2496,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:2498: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:2499: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:2501: checking for native build linker-flags" >&5
+	echo "$as_me:2502: checking for native build linker-flags" >&5
 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
 
 # Check whether --with-build-ldflags or --without-build-ldflags was given.
@@ -2506,10 +2507,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:2509: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:2510: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:2512: checking for native build linker-libraries" >&5
+	echo "$as_me:2513: checking for native build linker-libraries" >&5
 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
 
 # Check whether --with-build-libs or --without-build-libs was given.
@@ -2517,7 +2518,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:2520: result: $BUILD_LIBS" >&5
+	echo "$as_me:2521: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -2527,7 +2528,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 	: ${BUILD_CC:='${CC}'}
 
 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
-		{ { echo "$as_me:2530: error: Cross-build requires two compilers.
+		{ { echo "$as_me:2531: error: Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler." >&5
 echo "$as_me: error: Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler." >&2;}
@@ -2548,7 +2549,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:2551: checking for $ac_word" >&5
+echo "$as_me:2552: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2563,7 +2564,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:2566: found $ac_dir/$ac_word" >&5
+echo "$as_me:2567: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2571,10 +2572,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:2574: result: $RANLIB" >&5
+  echo "$as_me:2575: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:2577: result: no" >&5
+  echo "$as_me:2578: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2583,7 +2584,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:2586: checking for $ac_word" >&5
+echo "$as_me:2587: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2598,7 +2599,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:2601: found $ac_dir/$ac_word" >&5
+echo "$as_me:2602: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2607,10 +2608,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:2610: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:2611: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:2613: result: no" >&5
+  echo "$as_me:2614: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2622,7 +2623,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:2625: checking for $ac_word" >&5
+echo "$as_me:2626: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2637,7 +2638,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:2640: found $ac_dir/$ac_word" >&5
+echo "$as_me:2641: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2645,10 +2646,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:2648: result: $AR" >&5
+  echo "$as_me:2649: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:2651: result: no" >&5
+  echo "$as_me:2652: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2657,7 +2658,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:2660: checking for $ac_word" >&5
+echo "$as_me:2661: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2672,7 +2673,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:2675: found $ac_dir/$ac_word" >&5
+echo "$as_me:2676: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2681,10 +2682,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:2684: result: $ac_ct_AR" >&5
+  echo "$as_me:2685: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:2687: result: no" >&5
+  echo "$as_me:2688: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2697,7 +2698,7 @@ if test "${cf_cv_subst_AR_OPTS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "$as_me:2700: checking for archiver options (symbol AR_OPTS)" >&5
+echo "$as_me:2701: checking for archiver options (symbol AR_OPTS)" >&5
 echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
 
 if test -z "$AR_OPTS" ; then
@@ -2706,12 +2707,12 @@ if test -z "$AR_OPTS" ; then
 fi
 
 cf_cv_subst_AR_OPTS=$AR_OPTS
-echo "$as_me:2709: result: $AR_OPTS" >&5
+echo "$as_me:2710: result: $AR_OPTS" >&5
 echo "${ECHO_T}$AR_OPTS" >&6
 
 fi
 
-echo "$as_me:2714: checking if you want to see long compiling messages" >&5
+echo "$as_me:2715: checking if you want to see long compiling messages" >&5
 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
 
 # Check whether --enable-echo or --disable-echo was given.
@@ -2745,7 +2746,7 @@ else
     ECHO_CC=''
 
 fi;
-echo "$as_me:2748: result: $enableval" >&5
+echo "$as_me:2749: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 # special case for WWW/*
@@ -2755,7 +2756,7 @@ else
 	DONT_ECHO_CC=''
 fi
 
-echo "$as_me:2758: checking if you want to check memory-leaks" >&5
+echo "$as_me:2759: checking if you want to check memory-leaks" >&5
 echo $ECHO_N "checking if you want to check memory-leaks... $ECHO_C" >&6
 
 # Check whether --enable-find-leaks or --disable-find-leaks was given.
@@ -2772,7 +2773,7 @@ else
   with_leak_checks=no
 
 fi;
-echo "$as_me:2775: result: $with_leak_checks" >&5
+echo "$as_me:2776: result: $with_leak_checks" >&5
 echo "${ECHO_T}$with_leak_checks" >&6
 test "$with_leak_checks" = "yes" && cat >>confdefs.h <<\EOF
 #define LY_FIND_LEAKS 1
@@ -2781,7 +2782,7 @@ EOF
 # The comment about adding -g to $CFLAGS is unclear.  Autoconf tries to add
 # a -g flag; we remove it if the user's $CFLAGS was not set and debugging is
 # disabled.
-echo "$as_me:2784: checking if you want to enable debug-code" >&5
+echo "$as_me:2785: checking if you want to enable debug-code" >&5
 echo $ECHO_N "checking if you want to enable debug-code... $ECHO_C" >&6
 
 # Check whether --enable-debug or --disable-debug was given.
@@ -2798,7 +2799,7 @@ else
   with_debug=no
 
 fi;
-echo "$as_me:2801: result: $with_debug" >&5
+echo "$as_me:2802: result: $with_debug" >&5
 echo "${ECHO_T}$with_debug" >&6
 if test "$with_debug" = "yes" ; then
 	case $host_os in
@@ -2823,7 +2824,7 @@ else
 	esac
 fi
 
-echo "$as_me:2826: checking if you want to enable lynx trace code *recommended* " >&5
+echo "$as_me:2827: checking if you want to enable lynx trace code *recommended* " >&5
 echo $ECHO_N "checking if you want to enable lynx trace code *recommended* ... $ECHO_C" >&6
 
 # Check whether --enable-trace or --disable-trace was given.
@@ -2840,13 +2841,13 @@ else
   with_trace=yes
 
 fi;
-echo "$as_me:2843: result: $with_trace" >&5
+echo "$as_me:2844: result: $with_trace" >&5
 echo "${ECHO_T}$with_trace" >&6
 test $with_trace = no && cat >>confdefs.h <<\EOF
 #define NO_LYNX_TRACE 1
 EOF
 
-echo "$as_me:2849: checking if you want verbose trace code" >&5
+echo "$as_me:2850: checking if you want verbose trace code" >&5
 echo $ECHO_N "checking if you want verbose trace code... $ECHO_C" >&6
 
 # Check whether --enable-vertrace or --disable-vertrace was given.
@@ -2863,7 +2864,7 @@ else
   with_vertrace=no
 
 fi;
-echo "$as_me:2866: result: $with_vertrace" >&5
+echo "$as_me:2867: result: $with_vertrace" >&5
 echo "${ECHO_T}$with_vertrace" >&6
 test $with_vertrace = yes && cat >>confdefs.h <<\EOF
 #define LY_TRACELINE __LINE__
@@ -2871,7 +2872,7 @@ EOF
 
 if test -n "$GCC"
 then
-echo "$as_me:2874: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:2875: checking if you want to turn on gcc warnings" >&5
 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.
@@ -2888,7 +2889,7 @@ else
   with_warnings=no
 
 fi;
-echo "$as_me:2891: result: $with_warnings" >&5
+echo "$as_me:2892: result: $with_warnings" >&5
 echo "${ECHO_T}$with_warnings" >&6
 if test "$with_warnings" = "yes"
 then
@@ -2911,10 +2912,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:2914: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:2915: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
-#line 2917 "${as_me-configure}"
+#line 2918 "${as_me-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -2952,12 +2953,12 @@ EOF
 EOF
 			;;
 		esac
-		if { (eval echo "$as_me:2955: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:2956: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2958: \$? = $ac_status" >&5
+  echo "$as_me:2959: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:2960: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:2961: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 		fi
@@ -2970,11 +2971,11 @@ fi
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:2973: checking version of $CC" >&5
+	echo "$as_me:2974: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:2977: result: $GCC_VERSION" >&5
+	echo "$as_me:2978: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -2983,12 +2984,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case $host_os in
 	linux*|gnu*)
-		echo "$as_me:2986: checking if this is really Intel C compiler" >&5
+		echo "$as_me:2987: checking if this is really Intel C compiler" >&5
 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS -no-gcc"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 2991 "configure"
+#line 2992 "configure"
 #include "confdefs.h"
 
 int
@@ -3005,16 +3006,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3008: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3009: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3011: \$? = $ac_status" >&5
+  echo "$as_me:3012: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3015: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3017: \$? = $ac_status" >&5
+  echo "$as_me:3018: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -3025,14 +3026,14 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:3028: result: $INTEL_COMPILER" >&5
+		echo "$as_me:3029: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 3035 "${as_me-configure}"
+#line 3036 "${as_me-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -3050,7 +3051,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:3053: checking for $CC warning options..." >&5
+	{ echo "$as_me:3054: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-Wall"
@@ -3067,12 +3068,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:3070: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3071: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3073: \$? = $ac_status" >&5
+  echo "$as_me:3074: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3075: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:3076: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -3081,7 +3082,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GCC" = yes
 then
-	{ echo "$as_me:3084: checking for $CC warning options..." >&5
+	{ echo "$as_me:3085: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-W -Wall"
@@ -3101,12 +3102,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:3104: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3107: \$? = $ac_status" >&5
+  echo "$as_me:3108: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3109: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:3110: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case $cf_opt in #(vi
 			Wcast-qual) #(vi
@@ -3117,7 +3118,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				3.3*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me-configure}:3120: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me-configure}:3121: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -3133,7 +3134,7 @@ rm -f conftest*
 fi
 fi
 
-echo "$as_me:3136: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:3137: checking if you want to use dbmalloc for testing" >&5
 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dbmalloc or --without-dbmalloc was given.
@@ -3149,7 +3150,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:3152: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:3153: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -3233,23 +3234,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:3236: checking for dbmalloc.h" >&5
+	echo "$as_me:3237: checking for dbmalloc.h" >&5
 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3242 "configure"
+#line 3243 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:3246: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3247: \"$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:3252: \$? = $ac_status" >&5
+  echo "$as_me:3253: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3268,11 +3269,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3271: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:3272: result: $ac_cv_header_dbmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
 if test $ac_cv_header_dbmalloc_h = yes; then
 
-echo "$as_me:3275: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:3276: checking for debug_malloc in -ldbmalloc" >&5
 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3280,7 +3281,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3283 "configure"
+#line 3284 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3299,16 +3300,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3302: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3303: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3305: \$? = $ac_status" >&5
+  echo "$as_me:3306: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3308: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3309: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3311: \$? = $ac_status" >&5
+  echo "$as_me:3312: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -3319,7 +3320,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3322: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:3323: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
   cat >>confdefs.h <<EOF
@@ -3334,7 +3335,7 @@ fi
 
 fi
 
-echo "$as_me:3337: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:3338: checking if you want to use dmalloc for testing" >&5
 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dmalloc or --without-dmalloc was given.
@@ -3350,7 +3351,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:3353: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:3354: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -3434,23 +3435,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:3437: checking for dmalloc.h" >&5
+	echo "$as_me:3438: checking for dmalloc.h" >&5
 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3443 "configure"
+#line 3444 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:3447: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3448: \"$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:3453: \$? = $ac_status" >&5
+  echo "$as_me:3454: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3469,11 +3470,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3472: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:3473: result: $ac_cv_header_dmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
 if test $ac_cv_header_dmalloc_h = yes; then
 
-echo "$as_me:3476: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:3477: checking for dmalloc_debug in -ldmalloc" >&5
 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3481,7 +3482,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3484 "configure"
+#line 3485 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3500,16 +3501,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3503: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3504: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3506: \$? = $ac_status" >&5
+  echo "$as_me:3507: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3512: \$? = $ac_status" >&5
+  echo "$as_me:3513: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -3520,7 +3521,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3523: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:3524: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
   cat >>confdefs.h <<EOF
@@ -3539,7 +3540,7 @@ cat >>confdefs.h <<\EOF
 #define UNIX 1
 EOF
 
-echo "$as_me:3542: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:3543: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3547,7 +3548,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 3550 "configure"
+#line 3551 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -3596,16 +3597,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3599: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3600: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3602: \$? = $ac_status" >&5
+  echo "$as_me:3603: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3608: \$? = $ac_status" >&5
+  echo "$as_me:3609: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -3622,21 +3623,21 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:3625: result: none needed" >&5
+    echo "$as_me:3626: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:3628: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:3629: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
-echo "$as_me:3633: checking for an ANSI C-conforming const" >&5
+echo "$as_me:3634: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3639 "configure"
+#line 3640 "configure"
 #include "confdefs.h"
 
 int
@@ -3694,16 +3695,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3697: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3698: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3700: \$? = $ac_status" >&5
+  echo "$as_me:3701: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3703: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3704: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3706: \$? = $ac_status" >&5
+  echo "$as_me:3707: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -3713,7 +3714,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3716: result: $ac_cv_c_const" >&5
+echo "$as_me:3717: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -3761,7 +3762,7 @@ clix*)
 	# contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also
 	# references -lmalloc and -lbsd.
 
-echo "$as_me:3764: checking for strcmp in -lc_s" >&5
+echo "$as_me:3765: checking for strcmp in -lc_s" >&5
 echo $ECHO_N "checking for strcmp in -lc_s... $ECHO_C" >&6
 if test "${ac_cv_lib_c_s_strcmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3769,7 +3770,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_s  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3772 "configure"
+#line 3773 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3788,16 +3789,16 @@ strcmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3791: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3792: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3794: \$? = $ac_status" >&5
+  echo "$as_me:3795: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3797: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3798: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3800: \$? = $ac_status" >&5
+  echo "$as_me:3801: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_c_s_strcmp=yes
 else
@@ -3808,7 +3809,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3811: result: $ac_cv_lib_c_s_strcmp" >&5
+echo "$as_me:3812: result: $ac_cv_lib_c_s_strcmp" >&5
 echo "${ECHO_T}$ac_cv_lib_c_s_strcmp" >&6
 if test $ac_cv_lib_c_s_strcmp = yes; then
   cat >>confdefs.h <<EOF
@@ -3879,14 +3880,14 @@ sco*)
 	# SCO's cc (which is reported to have broken const/volatile).
 	case "$CC" in #(vi
 	cc|*/cc)
-		{ echo "$as_me:3882: WARNING: You should consider using gcc or rcc if available" >&5
+		{ echo "$as_me:3883: WARNING: You should consider using gcc or rcc if available" >&5
 echo "$as_me: WARNING: You should consider using gcc or rcc if available" >&2;}
 		unset ac_cv_prog_CC
 		for ac_prog in gcc rcc
 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:3889: checking for $ac_word" >&5
+echo "$as_me:3890: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3901,7 +3902,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_prog"
-echo "$as_me:3904: found $ac_dir/$ac_word" >&5
+echo "$as_me:3905: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3909,10 +3910,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:3912: result: $CC" >&5
+  echo "$as_me:3913: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:3915: result: no" >&5
+  echo "$as_me:3916: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3935,23 +3936,23 @@ sony-newsos*)
 for ac_header in jcurses.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3938: checking for $ac_header" >&5
+echo "$as_me:3939: 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 3944 "configure"
+#line 3945 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3948: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3949: \"$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:3954: \$? = $ac_status" >&5
+  echo "$as_me:3955: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3970,7 +3971,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3973: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:3974: 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
@@ -3998,23 +3999,23 @@ ultrix*)
 for ac_header in cursesX.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4001: checking for $ac_header" >&5
+echo "$as_me:4002: 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 4007 "configure"
+#line 4008 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4011: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4012: \"$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:4017: \$? = $ac_status" >&5
+  echo "$as_me:4018: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4033,7 +4034,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4036: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4037: 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
@@ -4050,7 +4051,7 @@ done
 	;;
 esac
 
-echo "$as_me:4053: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "$as_me:4054: checking for ${CC-cc} option to accept ANSI C" >&5
 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
 if test "${cf_cv_ansi_cc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4144,7 +4145,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 4147 "configure"
+#line 4148 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -4165,16 +4166,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4168: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4169: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4171: \$? = $ac_status" >&5
+  echo "$as_me:4172: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4177: \$? = $ac_status" >&5
+  echo "$as_me:4178: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -4187,7 +4188,7 @@ CFLAGS="$cf_save_CFLAGS"
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:4190: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:4191: result: $cf_cv_ansi_cc" >&5
 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then
@@ -4270,7 +4271,7 @@ fi
 fi
 
 if test "$cf_cv_ansi_cc" = "no"; then
-	{ { echo "$as_me:4273: error: Your compiler does not appear to recognize prototypes.
+	{ { echo "$as_me:4274: error: Your compiler does not appear to recognize prototypes.
 You have the following choices:
 	a. adjust your compiler options
 	b. get an up-to-date compiler
@@ -4290,7 +4291,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:4293: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:4294: checking for special C compiler options needed for large files" >&5
 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4302,7 +4303,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >conftest.$ac_ext <<_ACEOF
-#line 4305 "configure"
+#line 4306 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -4322,16 +4323,16 @@ main ()
 }
 _ACEOF
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4325: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4326: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4328: \$? = $ac_status" >&5
+  echo "$as_me:4329: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4332: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4334: \$? = $ac_status" >&5
+  echo "$as_me:4335: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -4341,16 +4342,16 @@ fi
 rm -f conftest.$ac_objext
      	 CC="$CC -n32"
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4344: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4345: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4347: \$? = $ac_status" >&5
+  echo "$as_me:4348: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4353: \$? = $ac_status" >&5
+  echo "$as_me:4354: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -4364,13 +4365,13 @@ rm -f conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:4367: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:4368: result: $ac_cv_sys_largefile_CC" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  echo "$as_me:4373: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:4374: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4378,7 +4379,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 4381 "configure"
+#line 4382 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -4398,16 +4399,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4401: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4402: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4404: \$? = $ac_status" >&5
+  echo "$as_me:4405: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4410: \$? = $ac_status" >&5
+  echo "$as_me:4411: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -4416,7 +4417,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 4419 "configure"
+#line 4420 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -4437,16 +4438,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4440: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4441: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4443: \$? = $ac_status" >&5
+  echo "$as_me:4444: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4449: \$? = $ac_status" >&5
+  echo "$as_me:4450: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -4457,7 +4458,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:4460: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:4461: result: $ac_cv_sys_file_offset_bits" >&5
 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
 if test "$ac_cv_sys_file_offset_bits" != no; then
 
@@ -4467,7 +4468,7 @@ EOF
 
 fi
 rm -f conftest*
-  echo "$as_me:4470: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:4471: checking for _LARGE_FILES value needed for large files" >&5
 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_large_files+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4475,7 +4476,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 4478 "configure"
+#line 4479 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -4495,16 +4496,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4498: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4499: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4501: \$? = $ac_status" >&5
+  echo "$as_me:4502: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4507: \$? = $ac_status" >&5
+  echo "$as_me:4508: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -4513,7 +4514,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 4516 "configure"
+#line 4517 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -4534,16 +4535,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4538: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4540: \$? = $ac_status" >&5
+  echo "$as_me:4541: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4546: \$? = $ac_status" >&5
+  echo "$as_me:4547: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -4554,7 +4555,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:4557: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:4558: result: $ac_cv_sys_large_files" >&5
 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
 if test "$ac_cv_sys_large_files" != no; then
 
@@ -4567,7 +4568,7 @@ rm -f conftest*
 fi
 
     if test "$enable_largefile" != no ; then
-	echo "$as_me:4570: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:4571: checking for _LARGEFILE_SOURCE value needed for large files" >&5
 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4575,7 +4576,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 4578 "configure"
+#line 4579 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -4587,16 +4588,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4590: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4591: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4593: \$? = $ac_status" >&5
+  echo "$as_me:4594: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4596: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4597: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4599: \$? = $ac_status" >&5
+  echo "$as_me:4600: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -4605,7 +4606,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 4608 "configure"
+#line 4609 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -4618,16 +4619,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4621: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4622: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4624: \$? = $ac_status" >&5
+  echo "$as_me:4625: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4628: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4630: \$? = $ac_status" >&5
+  echo "$as_me:4631: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -4638,7 +4639,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:4641: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:4642: result: $ac_cv_sys_largefile_source" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
 if test "$ac_cv_sys_largefile_source" != no; then
 
@@ -4652,13 +4653,13 @@ rm -f conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:4655: checking for fseeko" >&5
+echo "$as_me:4656: checking for fseeko" >&5
 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
 if test "${ac_cv_func_fseeko+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4661 "configure"
+#line 4662 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -4670,16 +4671,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4673: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4674: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4676: \$? = $ac_status" >&5
+  echo "$as_me:4677: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4682: \$? = $ac_status" >&5
+  echo "$as_me:4683: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -4689,7 +4690,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4692: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:4693: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -4710,14 +4711,14 @@ fi
 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
 	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
 
-	echo "$as_me:4713: checking whether to use struct dirent64" >&5
+	echo "$as_me:4714: checking whether to use struct dirent64" >&5
 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
 if test "${cf_cv_struct_dirent64+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 4720 "configure"
+#line 4721 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4738,16 +4739,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4741: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4742: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4744: \$? = $ac_status" >&5
+  echo "$as_me:4745: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4750: \$? = $ac_status" >&5
+  echo "$as_me:4751: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -4758,7 +4759,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:4761: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:4762: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_STRUCT_DIRENT64 1
@@ -4774,7 +4775,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:4777: checking for $ac_word" >&5
+echo "$as_me:4778: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4789,7 +4790,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:4792: found $ac_dir/$ac_word" >&5
+echo "$as_me:4793: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4797,10 +4798,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:4800: result: $RANLIB" >&5
+  echo "$as_me:4801: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:4803: result: no" >&5
+  echo "$as_me:4804: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4809,7 +4810,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:4812: checking for $ac_word" >&5
+echo "$as_me:4813: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4824,7 +4825,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:4827: found $ac_dir/$ac_word" >&5
+echo "$as_me:4828: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4833,10 +4834,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:4836: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4837: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:4839: result: no" >&5
+  echo "$as_me:4840: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4845,13 +4846,13 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-echo "$as_me:4848: checking for ANSI C header files" >&5
+echo "$as_me:4849: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4854 "configure"
+#line 4855 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4859,13 +4860,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:4862: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4863: \"$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:4868: \$? = $ac_status" >&5
+  echo "$as_me:4869: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4887,7 +4888,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 4890 "configure"
+#line 4891 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -4905,7 +4906,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 4908 "configure"
+#line 4909 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -4926,7 +4927,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4929 "configure"
+#line 4930 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -4952,15 +4953,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4955: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4956: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4958: \$? = $ac_status" >&5
+  echo "$as_me:4959: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4963: \$? = $ac_status" >&5
+  echo "$as_me:4964: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -4973,7 +4974,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:4976: result: $ac_cv_header_stdc" >&5
+echo "$as_me:4977: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -4983,7 +4984,7 @@ EOF
 
 fi
 
-echo "$as_me:4986: checking for inline" >&5
+echo "$as_me:4987: checking for inline" >&5
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4991,7 +4992,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 4994 "configure"
+#line 4995 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -5000,16 +5001,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5003: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5004: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5006: \$? = $ac_status" >&5
+  echo "$as_me:5007: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5009: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5010: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5012: \$? = $ac_status" >&5
+  echo "$as_me:5013: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -5020,7 +5021,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:5023: result: $ac_cv_c_inline" >&5
+echo "$as_me:5024: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -5041,28 +5042,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5044: checking for $ac_header" >&5
+echo "$as_me:5045: 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 5050 "configure"
+#line 5051 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5056: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5057: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5059: \$? = $ac_status" >&5
+  echo "$as_me:5060: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5065: \$? = $ac_status" >&5
+  echo "$as_me:5066: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -5072,7 +5073,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5075: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5076: 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
@@ -5082,13 +5083,13 @@ EOF
 fi
 done
 
-echo "$as_me:5085: checking for off_t" >&5
+echo "$as_me:5086: 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
-#line 5091 "configure"
+#line 5092 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5103,16 +5104,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5106: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5107: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5109: \$? = $ac_status" >&5
+  echo "$as_me:5110: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5112: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5115: \$? = $ac_status" >&5
+  echo "$as_me:5116: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -5122,7 +5123,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5125: result: $ac_cv_type_off_t" >&5
+echo "$as_me:5126: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
   :
@@ -5134,13 +5135,13 @@ EOF
 
 fi
 
-echo "$as_me:5137: checking for size_t" >&5
+echo "$as_me:5138: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5143 "configure"
+#line 5144 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5155,16 +5156,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5158: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5159: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5161: \$? = $ac_status" >&5
+  echo "$as_me:5162: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5167: \$? = $ac_status" >&5
+  echo "$as_me:5168: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -5174,7 +5175,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5177: result: $ac_cv_type_size_t" >&5
+echo "$as_me:5178: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
@@ -5188,13 +5189,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:5191: checking for working alloca.h" >&5
+echo "$as_me:5192: 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 5197 "configure"
+#line 5198 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -5206,16 +5207,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5209: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5210: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5212: \$? = $ac_status" >&5
+  echo "$as_me:5213: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5215: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5216: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5218: \$? = $ac_status" >&5
+  echo "$as_me:5219: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -5225,7 +5226,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5228: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:5229: 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
 
@@ -5235,13 +5236,13 @@ EOF
 
 fi
 
-echo "$as_me:5238: checking for alloca" >&5
+echo "$as_me:5239: 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 5244 "configure"
+#line 5245 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -5273,16 +5274,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5276: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5277: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5279: \$? = $ac_status" >&5
+  echo "$as_me:5280: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5285: \$? = $ac_status" >&5
+  echo "$as_me:5286: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -5292,7 +5293,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5295: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:5296: 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
@@ -5313,13 +5314,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:5316: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:5317: 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 5322 "configure"
+#line 5323 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -5337,18 +5338,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:5340: result: $ac_cv_os_cray" >&5
+echo "$as_me:5341: 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:5345: checking for $ac_func" >&5
+echo "$as_me:5346: 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 5351 "configure"
+#line 5352 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5379,16 +5380,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5382: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5383: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5385: \$? = $ac_status" >&5
+  echo "$as_me:5386: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5389: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5391: \$? = $ac_status" >&5
+  echo "$as_me:5392: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5398,7 +5399,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5401: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5402: 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
 
@@ -5412,7 +5413,7 @@ fi
   done
 fi
 
-echo "$as_me:5415: checking stack direction for C alloca" >&5
+echo "$as_me:5416: 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
@@ -5421,7 +5422,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5424 "configure"
+#line 5425 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -5444,15 +5445,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5447: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5448: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5450: \$? = $ac_status" >&5
+  echo "$as_me:5451: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5455: \$? = $ac_status" >&5
+  echo "$as_me:5456: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -5464,7 +5465,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:5467: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:5468: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -5476,23 +5477,23 @@ fi
 for ac_header in stdlib.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5479: checking for $ac_header" >&5
+echo "$as_me:5480: 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 5485 "configure"
+#line 5486 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5489: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5490: \"$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:5495: \$? = $ac_status" >&5
+  echo "$as_me:5496: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5511,7 +5512,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5514: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5515: 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
@@ -5524,13 +5525,13 @@ done
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5527: checking for $ac_func" >&5
+echo "$as_me:5528: 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 5533 "configure"
+#line 5534 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5561,16 +5562,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5564: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5565: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5567: \$? = $ac_status" >&5
+  echo "$as_me:5568: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5571: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5573: \$? = $ac_status" >&5
+  echo "$as_me:5574: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5580,7 +5581,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5583: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5584: 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
@@ -5590,7 +5591,7 @@ EOF
 fi
 done
 
-echo "$as_me:5593: checking for working mmap" >&5
+echo "$as_me:5594: checking for working mmap" >&5
 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5599,7 +5600,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5602 "configure"
+#line 5603 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -5726,15 +5727,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5729: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5730: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5732: \$? = $ac_status" >&5
+  echo "$as_me:5733: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5735: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5737: \$? = $ac_status" >&5
+  echo "$as_me:5738: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -5746,7 +5747,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:5749: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:5750: result: $ac_cv_func_mmap_fixed_mapped" >&5
 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
@@ -5757,13 +5758,13 @@ EOF
 fi
 rm -f conftest.mmap
 
-    echo "$as_me:5760: checking whether we are using the GNU C Library 2.1 or newer" >&5
+    echo "$as_me:5761: checking whether we are using the GNU C Library 2.1 or newer" >&5
 echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
 if test "${ac_cv_gnu_library_2_1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5766 "configure"
+#line 5767 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -5783,7 +5784,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:5786: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:5787: result: $ac_cv_gnu_library_2_1" >&5
 echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
 
     GLIBC21="$ac_cv_gnu_library_2_1"
@@ -5812,23 +5813,23 @@ for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5815: checking for $ac_header" >&5
+echo "$as_me:5816: 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 5821 "configure"
+#line 5822 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5825: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5826: \"$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:5831: \$? = $ac_status" >&5
+  echo "$as_me:5832: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5847,7 +5848,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5850: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5851: 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
@@ -5862,13 +5863,13 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
 strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5865: checking for $ac_func" >&5
+echo "$as_me:5866: 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 5871 "configure"
+#line 5872 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5899,16 +5900,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5902: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5903: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5905: \$? = $ac_status" >&5
+  echo "$as_me:5906: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5911: \$? = $ac_status" >&5
+  echo "$as_me:5912: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5918,7 +5919,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5921: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5922: 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
@@ -5966,7 +5967,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 5969 "configure"
+#line 5970 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5978,16 +5979,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5981: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5982: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5984: \$? = $ac_status" >&5
+  echo "$as_me:5985: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5988: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5990: \$? = $ac_status" >&5
+  echo "$as_me:5991: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6002,8 +6003,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:6005: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:6008: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -6043,7 +6046,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 6046 "configure"
+#line 6049 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6055,16 +6058,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6058: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6061: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6061: \$? = $ac_status" >&5
+  echo "$as_me:6064: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6067: \$? = $ac_status" >&5
+  echo "$as_me:6070: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6079,8 +6082,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:6082: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:6087: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -6095,7 +6100,7 @@ echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
 fi
 
 	else
-{ { echo "$as_me:6098: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:6103: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -6118,8 +6123,10 @@ if test -n "$cf_searchpath/lib" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:6121: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:6128: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -6145,8 +6152,10 @@ if test -n "$cf_searchpath" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:6148: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:6157: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -6154,7 +6163,7 @@ echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
 fi
 
 	else
-{ { echo "$as_me:6157: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:6166: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -6165,7 +6174,7 @@ done
 
 fi;
 
-  echo "$as_me:6168: checking for iconv" >&5
+  echo "$as_me:6177: 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
@@ -6176,10 +6185,10 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me-configure}:6179: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:6188: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 6182 "configure"
+#line 6191 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -6198,16 +6207,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6201: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6210: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6204: \$? = $ac_status" >&5
+  echo "$as_me:6213: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6216: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6210: \$? = $ac_status" >&5
+  echo "$as_me:6219: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_iconv=yes
 else
@@ -6216,7 +6225,7 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_iconv=no
 
-echo "${as_me-configure}:6219: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:6228: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -6297,11 +6306,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}:6300: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:6309: 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 6304 "configure"
+#line 6313 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -6320,21 +6329,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6323: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6332: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6326: \$? = $ac_status" >&5
+  echo "$as_me:6335: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6332: \$? = $ac_status" >&5
+  echo "$as_me:6341: \$? = $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}:6337: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:6346: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -6352,7 +6361,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me-configure}:6355: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:6364: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -6420,13 +6429,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}:6423: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:6432: 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 6429 "configure"
+#line 6438 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -6445,21 +6454,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6448: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6457: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6451: \$? = $ac_status" >&5
+  echo "$as_me:6460: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6457: \$? = $ac_status" >&5
+  echo "$as_me:6466: \$? = $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}:6462: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:6471: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -6495,7 +6504,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:6498: result: $am_cv_func_iconv" >&5
+echo "$as_me:6507: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -6504,14 +6513,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:6507: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:6516: 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 6514 "configure"
+#line 6523 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -6536,16 +6545,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6539: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6548: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6542: \$? = $ac_status" >&5
+  echo "$as_me:6551: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6548: \$? = $ac_status" >&5
+  echo "$as_me:6557: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -6555,7 +6564,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6558: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:6567: 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
@@ -6597,7 +6606,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 6600 "configure"
+#line 6609 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6609,16 +6618,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6612: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6621: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6615: \$? = $ac_status" >&5
+  echo "$as_me:6624: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6618: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6621: \$? = $ac_status" >&5
+  echo "$as_me:6630: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6633,8 +6642,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:6636: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:6647: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -6668,8 +6679,10 @@ if test -n "$cf_cv_library_path_iconv" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:6671: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:6684: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -6679,13 +6692,13 @@ fi
     fi
   fi
 
-  echo "$as_me:6682: checking for nl_langinfo and CODESET" >&5
+  echo "$as_me:6695: checking for nl_langinfo and CODESET" >&5
 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
 if test "${am_cv_langinfo_codeset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6688 "configure"
+#line 6701 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -6697,16 +6710,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6713: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6703: \$? = $ac_status" >&5
+  echo "$as_me:6716: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6719: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6709: \$? = $ac_status" >&5
+  echo "$as_me:6722: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -6717,7 +6730,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:6720: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:6733: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
   if test $am_cv_langinfo_codeset = yes; then
 
@@ -6728,13 +6741,13 @@ EOF
   fi
 
    if test $ac_cv_header_locale_h = yes; then
-    echo "$as_me:6731: checking for LC_MESSAGES" >&5
+    echo "$as_me:6744: checking for LC_MESSAGES" >&5
 echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
 if test "${am_cv_val_LC_MESSAGES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6737 "configure"
+#line 6750 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -6746,16 +6759,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6749: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6762: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6752: \$? = $ac_status" >&5
+  echo "$as_me:6765: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6758: \$? = $ac_status" >&5
+  echo "$as_me:6771: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -6765,7 +6778,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6768: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:6781: result: $am_cv_val_LC_MESSAGES" >&5
 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
     if test $am_cv_val_LC_MESSAGES = yes; then
 
@@ -6775,7 +6788,7 @@ EOF
 
     fi
   fi
-   echo "$as_me:6778: checking whether NLS is requested" >&5
+   echo "$as_me:6791: checking whether NLS is requested" >&5
 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
 
 # Check whether --enable-nls or --disable-nls was given.
@@ -6785,7 +6798,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=no
 fi;
-  echo "$as_me:6788: result: $USE_NLS" >&5
+  echo "$as_me:6801: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
   BUILD_INCLUDED_LIBINTL=no
@@ -6798,7 +6811,7 @@ cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
-    echo "$as_me:6801: checking whether included gettext is requested" >&5
+    echo "$as_me:6814: checking whether included gettext is requested" >&5
 echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
 
 # Check whether --with-included-gettext or --without-included-gettext was given.
@@ -6808,14 +6821,14 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-    echo "$as_me:6811: result: $nls_cv_force_use_gnu_gettext" >&5
+    echo "$as_me:6824: result: $nls_cv_force_use_gnu_gettext" >&5
 echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
 
     nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
     if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
                         CATOBJEXT=NONE
 
-      echo "$as_me:6818: checking for libintl.h and gettext()" >&5
+      echo "$as_me:6831: checking for libintl.h and gettext()" >&5
 echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6
 if test "${cf_cv_func_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6826,10 +6839,10 @@ else
 cf_cv_header_path_intl=
 cf_cv_library_path_intl=
 
-echo "${as_me-configure}:6829: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me-configure}:6842: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 6832 "configure"
+#line 6845 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -6849,16 +6862,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6852: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6865: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6855: \$? = $ac_status" >&5
+  echo "$as_me:6868: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6861: \$? = $ac_status" >&5
+  echo "$as_me:6874: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_intl=yes
 else
@@ -6867,7 +6880,7 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_intl=no
 
-echo "${as_me-configure}:6870: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me-configure}:6883: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -6948,11 +6961,11 @@ test -d "$oldincludedir" && {
       if test -d $cf_cv_header_path_intl ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_intl" 1>&6
 
-echo "${as_me-configure}:6951: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me-configure}:6964: testing ... testing $cf_cv_header_path_intl ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl"
         cat >conftest.$ac_ext <<_ACEOF
-#line 6955 "configure"
+#line 6968 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -6972,21 +6985,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6975: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6988: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6978: \$? = $ac_status" >&5
+  echo "$as_me:6991: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6994: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6984: \$? = $ac_status" >&5
+  echo "$as_me:6997: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found intl headers in $cf_cv_header_path_intl" 1>&6
 
-echo "${as_me-configure}:6989: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me-configure}:7002: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
 
             cf_cv_find_linkage_intl=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7004,7 +7017,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_intl" = maybe ; then
 
-echo "${as_me-configure}:7007: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me-configure}:7020: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -7072,13 +7085,13 @@ test -d "$HOME" && \
           if test -d $cf_cv_library_path_intl ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_intl" 1>&6
 
-echo "${as_me-configure}:7075: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me-configure}:7088: testing ... testing $cf_cv_library_path_intl ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lintl  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_intl"
             cat >conftest.$ac_ext <<_ACEOF
-#line 7081 "configure"
+#line 7094 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -7098,21 +7111,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7101: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7114: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7104: \$? = $ac_status" >&5
+  echo "$as_me:7117: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7110: \$? = $ac_status" >&5
+  echo "$as_me:7123: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found intl library in $cf_cv_library_path_intl" 1>&6
 
-echo "${as_me-configure}:7115: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me-configure}:7128: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
 
                 cf_cv_find_linkage_intl=yes
                 cf_cv_library_file_intl="-lintl"
@@ -7148,7 +7161,7 @@ cf_cv_func_gettext=no
 fi
 
 fi
-echo "$as_me:7151: result: $cf_cv_func_gettext" >&5
+echo "$as_me:7164: result: $cf_cv_func_gettext" >&5
 echo "${ECHO_T}$cf_cv_func_gettext" >&6
 
       if test "$cf_cv_func_gettext" = yes ; then
@@ -7186,7 +7199,7 @@ if test -n "$cf_cv_header_path_intl" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 7189 "configure"
+#line 7202 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7198,16 +7211,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7201: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7214: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7204: \$? = $ac_status" >&5
+  echo "$as_me:7217: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7210: \$? = $ac_status" >&5
+  echo "$as_me:7223: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7222,8 +7235,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:7225: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:7240: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -7257,8 +7272,10 @@ if test -n "$cf_cv_library_path_intl" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:7260: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:7277: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         INTLLIBS="-L$cf_add_libdir $$INTLLIBS"
       fi
     fi
@@ -7273,13 +7290,13 @@ fi
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7276: checking for $ac_func" >&5
+echo "$as_me:7293: 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 7282 "configure"
+#line 7299 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7310,16 +7327,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7313: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7330: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7316: \$? = $ac_status" >&5
+  echo "$as_me:7333: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7322: \$? = $ac_status" >&5
+  echo "$as_me:7339: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -7329,7 +7346,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7332: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7349: 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
@@ -7344,7 +7361,7 @@ done
                     # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:7347: checking for $ac_word" >&5
+echo "$as_me:7364: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7372,16 +7389,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:7375: result: $MSGFMT" >&5
+  echo "$as_me:7392: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:7378: result: no" >&5
+  echo "$as_me:7395: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
           # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:7384: checking for $ac_word" >&5
+echo "$as_me:7401: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7398,7 +7415,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_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:7401: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7418: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7410,17 +7427,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:7413: result: $GMSGFMT" >&5
+  echo "$as_me:7430: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:7416: result: no" >&5
+  echo "$as_me:7433: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
                     # Extract the first word of "xgettext", so it can be a program name with args.
 
 set dummy xgettext; ac_word=$2
-echo "$as_me:7423: checking for $ac_word" >&5
+echo "$as_me:7440: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7448,10 +7465,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:7451: result: $XGETTEXT" >&5
+  echo "$as_me:7468: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:7454: result: no" >&5
+  echo "$as_me:7471: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7466,7 +7483,7 @@ fi
 
     if test "$nls_cv_use_gnu_gettext" = "yes"; then
       if test ! -d $srcdir/intl ; then
-        { { echo "$as_me:7469: error: no NLS library is packaged with this application" >&5
+        { { echo "$as_me:7486: error: no NLS library is packaged with this application" >&5
 echo "$as_me: error: no NLS library is packaged with this application" >&2;}
    { (exit 1); exit 1; }; }
       fi
@@ -7474,7 +7491,7 @@ echo "$as_me: error: no NLS library is packaged with this application" >&2;}
       # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:7477: checking for $ac_word" >&5
+echo "$as_me:7494: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7502,16 +7519,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:7505: result: $MSGFMT" >&5
+  echo "$as_me:7522: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:7508: result: no" >&5
+  echo "$as_me:7525: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
       # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:7514: checking for $ac_word" >&5
+echo "$as_me:7531: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7528,7 +7545,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_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:7531: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7548: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7540,17 +7557,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:7543: result: $GMSGFMT" >&5
+  echo "$as_me:7560: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:7546: result: no" >&5
+  echo "$as_me:7563: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
       # Extract the first word of "xgettext", so it can be a program name with args.
 
 set dummy xgettext; ac_word=$2
-echo "$as_me:7553: checking for $ac_word" >&5
+echo "$as_me:7570: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7578,10 +7595,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:7581: result: $XGETTEXT" >&5
+  echo "$as_me:7598: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:7584: result: no" >&5
+  echo "$as_me:7601: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7596,7 +7613,7 @@ fi
                   if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
         : ;
       else
-        echo "$as_me:7599: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+        echo "$as_me:7616: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
 echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
         GMSGFMT=":"
       fi
@@ -7606,7 +7623,7 @@ echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
                       if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
         : ;
       else
-        echo "$as_me:7609: result: found xgettext program is not GNU xgettext; ignore it" >&5
+        echo "$as_me:7626: result: found xgettext program is not GNU xgettext; ignore it" >&5
 echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
         XGETTEXT=":"
       fi
@@ -7626,7 +7643,7 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
 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:7629: checking for $ac_word" >&5
+echo "$as_me:7646: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INTLBISON+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7641,7 +7658,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INTLBISON="$ac_prog"
-echo "$as_me:7644: found $ac_dir/$ac_word" >&5
+echo "$as_me:7661: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -7649,10 +7666,10 @@ fi
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
-  echo "$as_me:7652: result: $INTLBISON" >&5
+  echo "$as_me:7669: result: $INTLBISON" >&5
 echo "${ECHO_T}$INTLBISON" >&6
 else
-  echo "$as_me:7655: result: no" >&5
+  echo "$as_me:7672: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7662,7 +7679,7 @@ done
     if test -z "$INTLBISON"; then
       ac_verc_fail=yes
     else
-            echo "$as_me:7665: checking version of bison" >&5
+            echo "$as_me:7682: checking version of bison" >&5
 echo $ECHO_N "checking version of bison... $ECHO_C" >&6
       ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
       case $ac_prog_version in
@@ -7671,7 +7688,7 @@ echo $ECHO_N "checking version of bison... $ECHO_C" >&6
            ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
         *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
       esac
-    echo "$as_me:7674: result: $ac_prog_version" >&5
+    echo "$as_me:7691: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
     fi
     if test $ac_verc_fail = yes; then
@@ -7697,7 +7714,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:7700: checking for catalogs to be installed" >&5
+       echo "$as_me:7717: checking for catalogs to be installed" >&5
 echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do
@@ -7717,7 +7734,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:7720: result: $LINGUAS" >&5
+       echo "$as_me:7737: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -7750,7 +7767,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d $srcdir/po ; then
-echo "$as_me:7753: checking if we should use included message-library" >&5
+echo "$as_me:7770: checking if we should use included message-library" >&5
 echo $ECHO_N "checking if we should use included message-library... $ECHO_C" >&6
 
 # Check whether --enable-included-msgs or --disable-included-msgs was given.
@@ -7761,7 +7778,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:7764: result: $use_our_messages" >&5
+echo "$as_me:7781: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -7802,23 +7819,23 @@ else
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7805: checking for $ac_header" >&5
+echo "$as_me:7822: 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 7811 "configure"
+#line 7828 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7815: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7832: \"$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:7821: \$? = $ac_status" >&5
+  echo "$as_me:7838: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7837,7 +7854,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7840: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:7857: 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
@@ -7920,7 +7937,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:7923: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:7940: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -7929,7 +7946,7 @@ esac
 fi
 NLS_DATADIR="$withval"
 
-echo "$as_me:7932: checking if you want full utility pathnames" >&5
+echo "$as_me:7949: checking if you want full utility pathnames" >&5
 echo $ECHO_N "checking if you want full utility pathnames... $ECHO_C" >&6
 
 # Check whether --enable-full-paths or --disable-full-paths was given.
@@ -7946,13 +7963,13 @@ else
   with_full_paths=yes
 
 fi;
-echo "$as_me:7949: result: $with_full_paths" >&5
+echo "$as_me:7966: result: $with_full_paths" >&5
 echo "${ECHO_T}$with_full_paths" >&6
 test $with_full_paths = no && cat >>confdefs.h <<\EOF
 #define USE_EXECVP 1
 EOF
 
-echo "$as_me:7955: checking for system mailer" >&5
+echo "$as_me:7972: checking for system mailer" >&5
 echo $ECHO_N "checking for system mailer... $ECHO_C" >&6
 if test "${cf_cv_SYSTEM_MAIL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7972,13 +7989,13 @@ else
 
 fi
 
-echo "$as_me:7975: result: $cf_cv_SYSTEM_MAIL" >&5
+echo "$as_me:7992: result: $cf_cv_SYSTEM_MAIL" >&5
 echo "${ECHO_T}$cf_cv_SYSTEM_MAIL" >&6
 cat >>confdefs.h <<EOF
 #define SYSTEM_MAIL "$cf_cv_SYSTEM_MAIL"
 EOF
 
-echo "$as_me:7981: checking system mail flags" >&5
+echo "$as_me:7998: checking system mail flags" >&5
 echo $ECHO_N "checking system mail flags... $ECHO_C" >&6
 if test "${cf_cv_system_mail_flags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7994,7 +8011,7 @@ else
 
 fi
 
-echo "$as_me:7997: result: $cf_cv_system_mail_flags" >&5
+echo "$as_me:8014: result: $cf_cv_system_mail_flags" >&5
 echo "${ECHO_T}$cf_cv_system_mail_flags" >&6
 cat >>confdefs.h <<EOF
 #define SYSTEM_MAIL_FLAGS "$cf_cv_system_mail_flags"
@@ -8006,7 +8023,7 @@ if test $with_full_paths = no ; then
 fi
 fi
 
-echo "$as_me:8009: checking if $CC -U and -D options work together" >&5
+echo "$as_me:8026: checking if $CC -U and -D options work together" >&5
 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
 if test "${cf_cv_cc_u_d_options+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8015,7 +8032,7 @@ else
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8018 "configure"
+#line 8035 "configure"
 #include "confdefs.h"
 
 int
@@ -8034,16 +8051,16 @@ make a defined-error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8037: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8054: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8040: \$? = $ac_status" >&5
+  echo "$as_me:8057: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8046: \$? = $ac_status" >&5
+  echo "$as_me:8063: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_cc_u_d_options=yes
@@ -8057,7 +8074,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:8060: result: $cf_cv_cc_u_d_options" >&5
+echo "$as_me:8077: result: $cf_cv_cc_u_d_options" >&5
 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
 
 cf_XOPEN_SOURCE=600
@@ -8083,14 +8100,14 @@ irix[56].*) #(vi
 	;;
 linux*|gnu*|k*bsd*-gnu) #(vi
 
-echo "$as_me:8086: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:8103: checking if we must define _GNU_SOURCE" >&5
 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 8093 "configure"
+#line 8110 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8105,16 +8122,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8108: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8125: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8111: \$? = $ac_status" >&5
+  echo "$as_me:8128: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8131: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8117: \$? = $ac_status" >&5
+  echo "$as_me:8134: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -8123,7 +8140,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 8126 "configure"
+#line 8143 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8138,16 +8155,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8141: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8158: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8144: \$? = $ac_status" >&5
+  echo "$as_me:8161: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8150: \$? = $ac_status" >&5
+  echo "$as_me:8167: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -8162,7 +8179,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:8165: result: $cf_cv_gnu_source" >&5
+echo "$as_me:8182: result: $cf_cv_gnu_source" >&5
 echo "${ECHO_T}$cf_cv_gnu_source" >&6
 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 
@@ -8189,14 +8206,14 @@ solaris*) #(vi
 	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
 	;;
 *)
-	echo "$as_me:8192: checking if we should define _XOPEN_SOURCE" >&5
+	echo "$as_me:8209: checking if we should define _XOPEN_SOURCE" >&5
 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_xopen_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8199 "configure"
+#line 8216 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8211,16 +8228,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8214: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8231: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8217: \$? = $ac_status" >&5
+  echo "$as_me:8234: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8223: \$? = $ac_status" >&5
+  echo "$as_me:8240: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -8229,7 +8246,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 8232 "configure"
+#line 8249 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8244,16 +8261,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8247: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8264: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8250: \$? = $ac_status" >&5
+  echo "$as_me:8267: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8256: \$? = $ac_status" >&5
+  echo "$as_me:8273: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -8268,7 +8285,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:8271: result: $cf_cv_xopen_source" >&5
+echo "$as_me:8288: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 	if test "$cf_cv_xopen_source" != no ; then
 
@@ -8302,16 +8319,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:8305: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:8322: checking if we should define _POSIX_C_SOURCE" >&5
 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_posix_c_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "${as_me-configure}:8311: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me-configure}:8328: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8314 "configure"
+#line 8331 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8326,16 +8343,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8329: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8346: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8332: \$? = $ac_status" >&5
+  echo "$as_me:8349: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8352: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8338: \$? = $ac_status" >&5
+  echo "$as_me:8355: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -8356,7 +8373,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 8359 "configure"
+#line 8376 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8371,16 +8388,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8374: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8391: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8377: \$? = $ac_status" >&5
+  echo "$as_me:8394: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8397: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8383: \$? = $ac_status" >&5
+  echo "$as_me:8400: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8391,15 +8408,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me-configure}:8394: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me-configure}:8411: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
-echo "${as_me-configure}:8399: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me-configure}:8416: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 8402 "configure"
+#line 8419 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8414,16 +8431,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8417: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8434: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8420: \$? = $ac_status" >&5
+  echo "$as_me:8437: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8426: \$? = $ac_status" >&5
+  echo "$as_me:8443: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8439,7 +8456,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:8442: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:8459: result: $cf_cv_posix_c_source" >&5
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then
@@ -8456,14 +8473,14 @@ fi
 	;;
 esac
 
-echo "$as_me:8459: checking if SIGWINCH is defined" >&5
+echo "$as_me:8476: checking if SIGWINCH is defined" >&5
 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
 if test "${cf_cv_define_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8466 "configure"
+#line 8483 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -8478,23 +8495,23 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8481: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8498: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8484: \$? = $ac_status" >&5
+  echo "$as_me:8501: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8504: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8490: \$? = $ac_status" >&5
+  echo "$as_me:8507: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 8497 "configure"
+#line 8514 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -8512,16 +8529,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8515: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8532: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8518: \$? = $ac_status" >&5
+  echo "$as_me:8535: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8538: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8524: \$? = $ac_status" >&5
+  echo "$as_me:8541: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -8535,11 +8552,11 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:8538: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:8555: result: $cf_cv_define_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
 
 if test "$cf_cv_define_sigwinch" = maybe ; then
-echo "$as_me:8542: checking for actual SIGWINCH definition" >&5
+echo "$as_me:8559: checking for actual SIGWINCH definition" >&5
 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
 if test "${cf_cv_fixup_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8550,7 +8567,7 @@ cf_sigwinch=32
 while test $cf_sigwinch != 1
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8553 "configure"
+#line 8570 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -8572,16 +8589,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8575: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8592: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8578: \$? = $ac_status" >&5
+  echo "$as_me:8595: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8584: \$? = $ac_status" >&5
+  echo "$as_me:8601: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -8595,7 +8612,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
 done
 
 fi
-echo "$as_me:8598: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:8615: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -8607,7 +8624,7 @@ if test -n "$TRY_CFLAGS" ; then
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:8610: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me-configure}:8627: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -8668,7 +8685,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}:8671: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me-configure}:8688: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -8676,7 +8693,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}:8679: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me-configure}:8696: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
 fi
@@ -8684,14 +8701,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}:8687: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me-configure}:8704: 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 8694 "configure"
+#line 8711 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8703,16 +8720,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8706: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8723: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8709: \$? = $ac_status" >&5
+  echo "$as_me:8726: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8715: \$? = $ac_status" >&5
+  echo "$as_me:8732: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8720,12 +8737,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:8723: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me-configure}:8740: 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}:8728: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me-configure}:8745: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -8737,7 +8754,25 @@ fi
 
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
-echo "$as_me:8740: checking if you want ssl library" >&5
+echo "$as_me:8757: checking if you want NSS compatible SSL libraries" >&5
+echo $ECHO_N "checking if you want NSS compatible SSL libraries... $ECHO_C" >&6
+if test "${cf_cv_use_libnss_compat+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+# Check whether --with-nss-compat or --without-nss-compat was given.
+if test "${with_nss_compat+set}" = set; then
+  withval="$with_nss_compat"
+  cf_cv_use_libnss_compat=$withval
+else
+  cf_cv_use_libnss_compat=no
+fi;
+
+fi
+echo "$as_me:8772: result: $cf_cv_use_libnss_compat" >&5
+echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6
+
+echo "$as_me:8775: checking if you want ssl library" >&5
 echo $ECHO_N "checking if you want ssl library... $ECHO_C" >&6
 if test "${cf_cv_use_libssl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8752,11 +8787,10 @@ else
 fi;
 
 fi
-echo "$as_me:8755: result: $cf_cv_use_libssl" >&5
+echo "$as_me:8790: result: $cf_cv_use_libssl" >&5
 echo "${ECHO_T}$cf_cv_use_libssl" >&6
 
-if test "x$cf_cv_use_libssl" = "xno" ; then
-echo "$as_me:8759: checking if you want gnutls support" >&5
+echo "$as_me:8793: checking if you want gnutls support" >&5
 echo $ECHO_N "checking if you want gnutls support... $ECHO_C" >&6
 if test "${cf_cv_use_libgnutls+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8771,11 +8805,10 @@ else
 fi;
 
 fi
-echo "$as_me:8774: result: $cf_cv_use_libgnutls" >&5
+echo "$as_me:8808: result: $cf_cv_use_libgnutls" >&5
 echo "${ECHO_T}$cf_cv_use_libgnutls" >&6
-fi
 
-echo "$as_me:8778: checking if you want socks library" >&5
+echo "$as_me:8811: checking if you want socks library" >&5
 echo $ECHO_N "checking if you want socks library... $ECHO_C" >&6
 if test "${cf_cv_use_libsocks+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8790,10 +8823,10 @@ else
 fi;
 
 fi
-echo "$as_me:8793: result: $cf_cv_use_libsocks" >&5
+echo "$as_me:8826: result: $cf_cv_use_libsocks" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks" >&6
 
-echo "$as_me:8796: checking if you want socks5 library" >&5
+echo "$as_me:8829: checking if you want socks5 library" >&5
 echo $ECHO_N "checking if you want socks5 library... $ECHO_C" >&6
 if test "${cf_cv_use_libsocks5+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8808,7 +8841,7 @@ else
 fi;
 
 fi
-echo "$as_me:8811: result: $cf_cv_use_libsocks5" >&5
+echo "$as_me:8844: result: $cf_cv_use_libsocks5" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6
 
 if test "x$cf_cv_use_libsocks" != xno ; then
@@ -8847,7 +8880,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 8850 "configure"
+#line 8883 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8859,16 +8892,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8862: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8895: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8865: \$? = $ac_status" >&5
+  echo "$as_me:8898: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8901: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8871: \$? = $ac_status" >&5
+  echo "$as_me:8904: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8883,8 +8916,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:8886: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:8921: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -8924,7 +8959,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 8927 "configure"
+#line 8962 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8936,16 +8971,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8939: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8974: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8942: \$? = $ac_status" >&5
+  echo "$as_me:8977: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8948: \$? = $ac_status" >&5
+  echo "$as_me:8983: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8960,8 +8995,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:8963: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:9000: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -8976,7 +9013,7 @@ echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
 fi
 
 	else
-{ { echo "$as_me:8979: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:9016: error: cannot find socks library under $cf_cv_use_libsocks" >&5
 echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -8999,8 +9036,10 @@ if test -n "$cf_searchpath/lib" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:9002: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:9041: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -9026,8 +9065,10 @@ if test -n "$cf_searchpath" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:9029: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:9070: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -9035,7 +9076,7 @@ echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
 fi
 
 	else
-{ { echo "$as_me:9038: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:9079: error: cannot find socks library under $cf_cv_use_libsocks" >&5
 echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9049,10 +9090,10 @@ done
 cf_cv_header_path_socks=
 cf_cv_library_path_socks=
 
-echo "${as_me-configure}:9052: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me-configure}:9093: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 9055 "configure"
+#line 9096 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -9068,16 +9109,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9112: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9074: \$? = $ac_status" >&5
+  echo "$as_me:9115: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9118: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9080: \$? = $ac_status" >&5
+  echo "$as_me:9121: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_socks=yes
 else
@@ -9086,7 +9127,7 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_socks=no
 
-echo "${as_me-configure}:9089: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me-configure}:9130: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -9167,11 +9208,11 @@ test -d "$oldincludedir" && {
       if test -d $cf_cv_header_path_socks ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_socks" 1>&6
 
-echo "${as_me-configure}:9170: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me-configure}:9211: testing ... testing $cf_cv_header_path_socks ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_socks"
         cat >conftest.$ac_ext <<_ACEOF
-#line 9174 "configure"
+#line 9215 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -9187,21 +9228,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9190: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9231: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9193: \$? = $ac_status" >&5
+  echo "$as_me:9234: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9199: \$? = $ac_status" >&5
+  echo "$as_me:9240: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found socks headers in $cf_cv_header_path_socks" 1>&6
 
-echo "${as_me-configure}:9204: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me-configure}:9245: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
 
             cf_cv_find_linkage_socks=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -9219,7 +9260,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_socks" = maybe ; then
 
-echo "${as_me-configure}:9222: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me-configure}:9263: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -9287,13 +9328,13 @@ test -d "$HOME" && \
           if test -d $cf_cv_library_path_socks ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_socks" 1>&6
 
-echo "${as_me-configure}:9290: testing ... testing $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me-configure}:9331: testing ... testing $cf_cv_library_path_socks ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lsocks  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_socks"
             cat >conftest.$ac_ext <<_ACEOF
-#line 9296 "configure"
+#line 9337 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -9309,21 +9350,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9312: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9353: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9315: \$? = $ac_status" >&5
+  echo "$as_me:9356: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9321: \$? = $ac_status" >&5
+  echo "$as_me:9362: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found socks library in $cf_cv_library_path_socks" 1>&6
 
-echo "${as_me-configure}:9326: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me-configure}:9367: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
 
                 cf_cv_find_linkage_socks=yes
                 cf_cv_library_file_socks="-lsocks"
@@ -9419,7 +9460,7 @@ if test -n "$cf_cv_header_path_socks" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 9422 "configure"
+#line 9463 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9431,16 +9472,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9434: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9475: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9437: \$? = $ac_status" >&5
+  echo "$as_me:9478: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9443: \$? = $ac_status" >&5
+  echo "$as_me:9484: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9455,8 +9496,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:9458: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:9501: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -9487,8 +9530,10 @@ if test -n "$cf_cv_library_path_socks" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:9490: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:9535: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -9497,7 +9542,7 @@ fi
 
     LIBS="$LIBS -lsocks"
   else
-    { { echo "$as_me:9500: error: cannot link with socks library" >&5
+    { { echo "$as_me:9545: error: cannot link with socks library" >&5
 echo "$as_me: error: cannot link with socks library" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -9538,7 +9583,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 9541 "configure"
+#line 9586 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9550,16 +9595,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9553: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9598: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9556: \$? = $ac_status" >&5
+  echo "$as_me:9601: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9562: \$? = $ac_status" >&5
+  echo "$as_me:9607: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9574,8 +9619,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:9577: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:9624: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -9615,7 +9662,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 9618 "configure"
+#line 9665 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9627,16 +9674,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9630: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9677: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9633: \$? = $ac_status" >&5
+  echo "$as_me:9680: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9639: \$? = $ac_status" >&5
+  echo "$as_me:9686: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9651,8 +9698,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:9654: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:9703: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -9667,7 +9716,7 @@ echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
 fi
 
 	else
-{ { echo "$as_me:9670: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:9719: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
 echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9690,8 +9739,10 @@ if test -n "$cf_searchpath/lib" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:9693: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:9744: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -9717,8 +9768,10 @@ if test -n "$cf_searchpath" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:9720: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:9773: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -9726,7 +9779,7 @@ echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
 fi
 
 	else
-{ { echo "$as_me:9729: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:9782: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
 echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9745,11 +9798,11 @@ cat >>confdefs.h <<\EOF
 #define SOCKS 1
 EOF
 
-echo "$as_me:9748: checking if the socks library uses socks4 prefix" >&5
+echo "$as_me:9801: checking if the socks library uses socks4 prefix" >&5
 echo $ECHO_N "checking if the socks library uses socks4 prefix... $ECHO_C" >&6
 cf_use_socks4=error
 cat >conftest.$ac_ext <<_ACEOF
-#line 9752 "configure"
+#line 9805 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -9763,16 +9816,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9766: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9819: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9769: \$? = $ac_status" >&5
+  echo "$as_me:9822: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9775: \$? = $ac_status" >&5
+  echo "$as_me:9828: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >>confdefs.h <<\EOF
 #define USE_SOCKS4_PREFIX 1
@@ -9783,7 +9836,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 9786 "configure"
+#line 9839 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int
@@ -9795,29 +9848,29 @@ SOCKSinit((char *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9801: \$? = $ac_status" >&5
+  echo "$as_me:9854: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9807: \$? = $ac_status" >&5
+  echo "$as_me:9860: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_use_socks4=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:9813: error: Cannot link with socks5 library" >&5
+{ { echo "$as_me:9866: error: Cannot link with socks5 library" >&5
 echo "$as_me: error: Cannot link with socks5 library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:9820: result: $cf_use_socks4" >&5
+echo "$as_me:9873: result: $cf_use_socks4" >&5
 echo "${ECHO_T}$cf_use_socks4" >&6
 
 if test "$cf_use_socks4" = "yes" ; then
@@ -9872,10 +9925,10 @@ EOF
 
 fi
 
-echo "$as_me:9875: checking if socks5p.h is available" >&5
+echo "$as_me:9928: checking if socks5p.h is available" >&5
 echo $ECHO_N "checking if socks5p.h is available... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 9878 "configure"
+#line 9931 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -9890,16 +9943,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9893: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9946: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9896: \$? = $ac_status" >&5
+  echo "$as_me:9949: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9902: \$? = $ac_status" >&5
+  echo "$as_me:9955: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_use_socks5p_h=yes
 else
@@ -9908,7 +9961,7 @@ cat conftest.$ac_ext >&5
 cf_use_socks5p_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:9911: result: $cf_use_socks5p_h" >&5
+echo "$as_me:9964: result: $cf_use_socks5p_h" >&5
 echo "${ECHO_T}$cf_use_socks5p_h" >&6
 
 test "$cf_use_socks5p_h" = yes && cat >>confdefs.h <<\EOF
@@ -9918,13 +9971,13 @@ EOF
 else
 
 cf_test_netlibs=no
-echo "$as_me:9921: checking for network libraries" >&5
+echo "$as_me:9974: checking for network libraries" >&5
 echo $ECHO_N "checking for network libraries... $ECHO_C" >&6
 if test "${cf_cv_netlibs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "$as_me:9927: result: working..." >&5
+echo "$as_me:9980: result: working..." >&5
 echo "${ECHO_T}working..." >&6
 cf_cv_netlibs=""
 cf_test_netlibs=yes
@@ -9932,13 +9985,13 @@ cf_test_netlibs=yes
 for ac_func in gethostname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9935: checking for $ac_func" >&5
+echo "$as_me:9988: 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 9941 "configure"
+#line 9994 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9969,16 +10022,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9972: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10025: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9975: \$? = $ac_status" >&5
+  echo "$as_me:10028: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9981: \$? = $ac_status" >&5
+  echo "$as_me:10034: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9988,7 +10041,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9991: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10044: 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
@@ -9997,7 +10050,7 @@ EOF
 
 else
 
-echo "$as_me:10000: checking for gethostname in -lnsl" >&5
+echo "$as_me:10053: checking for gethostname in -lnsl" >&5
 echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10005,7 +10058,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10008 "configure"
+#line 10061 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10024,16 +10077,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10027: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10080: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10030: \$? = $ac_status" >&5
+  echo "$as_me:10083: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10036: \$? = $ac_status" >&5
+  echo "$as_me:10089: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -10044,7 +10097,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10047: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:10100: result: $ac_cv_lib_nsl_gethostname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6
 if test $ac_cv_lib_nsl_gethostname = yes; then
 
@@ -10061,7 +10114,7 @@ else
 	ac_cv_func_gethostname=unknown
 	unset ac_cv_func_gethostname 2>/dev/null
 
-echo "$as_me:10064: checking for gethostname in -lsocket" >&5
+echo "$as_me:10117: checking for gethostname in -lsocket" >&5
 echo $ECHO_N "checking for gethostname in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_gethostname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10069,7 +10122,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10072 "configure"
+#line 10125 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10088,16 +10141,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10091: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10144: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10094: \$? = $ac_status" >&5
+  echo "$as_me:10147: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10100: \$? = $ac_status" >&5
+  echo "$as_me:10153: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_gethostname=yes
 else
@@ -10108,7 +10161,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10111: result: $ac_cv_lib_socket_gethostname" >&5
+echo "$as_me:10164: result: $ac_cv_lib_socket_gethostname" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_gethostname" >&6
 if test $ac_cv_lib_socket_gethostname = yes; then
 
@@ -10136,7 +10189,7 @@ done
 # FIXME:  sequent needs this library (i.e., -lsocket -linet -lnsl), but
 # I don't know the entrypoints - 97/7/22 TD
 # AC_HAVE_LIBRARY(inet,cf_cv_netlibs="-linet $cf_cv_netlibs")
-echo "$as_me:10139: checking for main in -linet" >&5
+echo "$as_me:10192: checking for main in -linet" >&5
 echo $ECHO_N "checking for main in -linet... $ECHO_C" >&6
 if test "${ac_cv_lib_inet_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10144,7 +10197,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10147 "configure"
+#line 10200 "configure"
 #include "confdefs.h"
 
 int
@@ -10156,16 +10209,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10159: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10212: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10162: \$? = $ac_status" >&5
+  echo "$as_me:10215: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10218: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10168: \$? = $ac_status" >&5
+  echo "$as_me:10221: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_inet_main=yes
 else
@@ -10176,7 +10229,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10179: result: $ac_cv_lib_inet_main" >&5
+echo "$as_me:10232: result: $ac_cv_lib_inet_main" >&5
 echo "${ECHO_T}$ac_cv_lib_inet_main" >&6
 if test $ac_cv_lib_inet_main = yes; then
   cf_cv_netlibs="-linet $cf_cv_netlibs"
@@ -10188,13 +10241,13 @@ if test "$ac_cv_func_lsocket" != no ; then
 for ac_func in socket
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10191: checking for $ac_func" >&5
+echo "$as_me:10244: 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 10197 "configure"
+#line 10250 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10225,16 +10278,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10228: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10281: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10231: \$? = $ac_status" >&5
+  echo "$as_me:10284: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10234: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10237: \$? = $ac_status" >&5
+  echo "$as_me:10290: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10244,7 +10297,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10247: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10300: 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
@@ -10253,7 +10306,7 @@ EOF
 
 else
 
-echo "$as_me:10256: checking for socket in -lsocket" >&5
+echo "$as_me:10309: checking for socket in -lsocket" >&5
 echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10261,7 +10314,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10264 "configure"
+#line 10317 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10280,16 +10333,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10283: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10336: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10286: \$? = $ac_status" >&5
+  echo "$as_me:10339: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10342: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10292: \$? = $ac_status" >&5
+  echo "$as_me:10345: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -10300,7 +10353,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10303: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:10356: result: $ac_cv_lib_socket_socket" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
 if test $ac_cv_lib_socket_socket = yes; then
 
@@ -10317,7 +10370,7 @@ else
 	ac_cv_func_socket=unknown
 	unset ac_cv_func_socket 2>/dev/null
 
-echo "$as_me:10320: checking for socket in -lbsd" >&5
+echo "$as_me:10373: checking for socket in -lbsd" >&5
 echo $ECHO_N "checking for socket in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10325,7 +10378,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10328 "configure"
+#line 10381 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10344,16 +10397,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10347: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10400: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10350: \$? = $ac_status" >&5
+  echo "$as_me:10403: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10353: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10356: \$? = $ac_status" >&5
+  echo "$as_me:10409: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_socket=yes
 else
@@ -10364,7 +10417,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10367: result: $ac_cv_lib_bsd_socket" >&5
+echo "$as_me:10420: result: $ac_cv_lib_bsd_socket" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_socket" >&6
 if test $ac_cv_lib_bsd_socket = yes; then
 
@@ -10394,13 +10447,13 @@ fi
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10397: checking for $ac_func" >&5
+echo "$as_me:10450: 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 10403 "configure"
+#line 10456 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10431,16 +10484,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10434: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10487: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10437: \$? = $ac_status" >&5
+  echo "$as_me:10490: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10443: \$? = $ac_status" >&5
+  echo "$as_me:10496: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10450,7 +10503,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10453: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10506: 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
@@ -10459,7 +10512,7 @@ EOF
 
 else
 
-echo "$as_me:10462: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:10515: 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
@@ -10467,7 +10520,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10470 "configure"
+#line 10523 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10486,16 +10539,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10542: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10492: \$? = $ac_status" >&5
+  echo "$as_me:10545: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10498: \$? = $ac_status" >&5
+  echo "$as_me:10551: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -10506,7 +10559,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10509: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:10562: 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
 
@@ -10533,13 +10586,13 @@ done
 for ac_func in strcasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10536: checking for $ac_func" >&5
+echo "$as_me:10589: 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 10542 "configure"
+#line 10595 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10570,16 +10623,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10573: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10576: \$? = $ac_status" >&5
+  echo "$as_me:10629: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10582: \$? = $ac_status" >&5
+  echo "$as_me:10635: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10589,7 +10642,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10592: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10645: 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
@@ -10598,7 +10651,7 @@ EOF
 
 else
 
-echo "$as_me:10601: checking for strcasecmp in -lresolv" >&5
+echo "$as_me:10654: checking for strcasecmp in -lresolv" >&5
 echo $ECHO_N "checking for strcasecmp in -lresolv... $ECHO_C" >&6
 if test "${ac_cv_lib_resolv_strcasecmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10606,7 +10659,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10609 "configure"
+#line 10662 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10625,16 +10678,16 @@ strcasecmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10628: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10681: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10631: \$? = $ac_status" >&5
+  echo "$as_me:10684: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10637: \$? = $ac_status" >&5
+  echo "$as_me:10690: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -10645,7 +10698,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10648: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:10701: result: $ac_cv_lib_resolv_strcasecmp" >&5
 echo "${ECHO_T}$ac_cv_lib_resolv_strcasecmp" >&6
 if test $ac_cv_lib_resolv_strcasecmp = yes; then
 
@@ -10674,14 +10727,14 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6
 
 fi
 
-echo "$as_me:10677: checking for inet_aton function" >&5
+echo "$as_me:10730: checking for inet_aton function" >&5
 echo $ECHO_N "checking for inet_aton function... $ECHO_C" >&6
 if test "${cf_cv_have_inet_aton+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10684 "configure"
+#line 10737 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -10697,16 +10750,16 @@ inet_aton(0, (struct in_addr *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10753: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10703: \$? = $ac_status" >&5
+  echo "$as_me:10756: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10709: \$? = $ac_status" >&5
+  echo "$as_me:10762: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_aton=yes
 else
@@ -10716,7 +10769,7 @@ cf_cv_have_inet_aton=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10719: result: $cf_cv_have_inet_aton" >&5
+echo "$as_me:10772: result: $cf_cv_have_inet_aton" >&5
 echo "${ECHO_T}$cf_cv_have_inet_aton" >&6
 if test "$cf_cv_have_inet_aton" = yes ; then
     cat >>confdefs.h <<\EOF
@@ -10724,14 +10777,14 @@ if test "$cf_cv_have_inet_aton" = yes ; then
 EOF
 
 else
-    echo "$as_me:10727: checking for inet_addr function" >&5
+    echo "$as_me:10780: checking for inet_addr function" >&5
 echo $ECHO_N "checking for inet_addr function... $ECHO_C" >&6
 if test "${cf_cv_have_inet_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 10734 "configure"
+#line 10787 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -10747,16 +10800,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10750: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10803: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10753: \$? = $ac_status" >&5
+  echo "$as_me:10806: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10809: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10759: \$? = $ac_status" >&5
+  echo "$as_me:10812: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_addr=yes
 else
@@ -10766,10 +10819,10 @@ cf_cv_have_inet_addr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10769: result: $cf_cv_have_inet_addr" >&5
+echo "$as_me:10822: result: $cf_cv_have_inet_addr" >&5
 echo "${ECHO_T}$cf_cv_have_inet_addr" >&6
     if test "$cf_cv_have_inet_addr" = no ; then
-	echo "$as_me:10772: checking for library with inet_addr" >&5
+	echo "$as_me:10825: checking for library with inet_addr" >&5
 echo $ECHO_N "checking for library with inet_addr... $ECHO_C" >&6
 if test "${cf_cv_lib_inet_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10780,7 +10833,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 10783 "configure"
+#line 10836 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -10796,16 +10849,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10799: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10852: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10802: \$? = $ac_status" >&5
+  echo "$as_me:10855: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10808: \$? = $ac_status" >&5
+  echo "$as_me:10861: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -10819,12 +10872,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	    done
 
 fi
-echo "$as_me:10822: result: $cf_cv_lib_inet_addr" >&5
+echo "$as_me:10875: result: $cf_cv_lib_inet_addr" >&5
 echo "${ECHO_T}$cf_cv_lib_inet_addr" >&6
 	if test "$cf_cv_lib_inet_addr" != no ; then
 	    LIBS="$LIBS $cf_cv_lib_inet_addr"
 	else
-	    { echo "$as_me:10827: WARNING: Unable to find library for inet_addr function" >&5
+	    { echo "$as_me:10880: WARNING: Unable to find library for inet_addr function" >&5
 echo "$as_me: WARNING: Unable to find library for inet_addr function" >&2;}
 	fi
     fi
@@ -10866,7 +10919,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 10869 "configure"
+#line 10922 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10878,16 +10931,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10881: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10934: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10884: \$? = $ac_status" >&5
+  echo "$as_me:10937: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10890: \$? = $ac_status" >&5
+  echo "$as_me:10943: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10902,8 +10955,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:10905: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:10960: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -10943,7 +10998,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 10946 "configure"
+#line 11001 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10955,16 +11010,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10958: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11013: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10961: \$? = $ac_status" >&5
+  echo "$as_me:11016: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11019: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10967: \$? = $ac_status" >&5
+  echo "$as_me:11022: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10979,8 +11034,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:10982: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:11039: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -10995,7 +11052,7 @@ echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
 fi
 
 	else
-{ { echo "$as_me:10998: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:11055: error: cannot find ssl library under $cf_cv_use_libssl" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libssl" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -11018,8 +11075,10 @@ if test -n "$cf_searchpath/lib" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:11021: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:11080: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -11045,8 +11104,10 @@ if test -n "$cf_searchpath" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:11048: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:11109: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -11054,7 +11115,7 @@ echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
 fi
 
 	else
-{ { echo "$as_me:11057: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:11118: error: cannot find ssl library under $cf_cv_use_libssl" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libssl" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -11068,10 +11129,10 @@ done
 cf_cv_header_path_ssl=
 cf_cv_library_path_ssl=
 
-echo "${as_me-configure}:11071: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me-configure}:11132: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11074 "configure"
+#line 11135 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11094,16 +11155,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11097: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11158: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11100: \$? = $ac_status" >&5
+  echo "$as_me:11161: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11106: \$? = $ac_status" >&5
+  echo "$as_me:11167: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_ssl=yes
 else
@@ -11112,7 +11173,7 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_ssl=no
 
-echo "${as_me-configure}:11115: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me-configure}:11176: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11193,11 +11254,11 @@ test -d "$oldincludedir" && {
       if test -d $cf_cv_header_path_ssl ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me-configure}:11196: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me-configure}:11257: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_ssl"
         cat >conftest.$ac_ext <<_ACEOF
-#line 11200 "configure"
+#line 11261 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11220,21 +11281,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11223: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11284: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11226: \$? = $ac_status" >&5
+  echo "$as_me:11287: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11232: \$? = $ac_status" >&5
+  echo "$as_me:11293: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found ssl headers in $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me-configure}:11237: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me-configure}:11298: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
             cf_cv_find_linkage_ssl=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11252,7 +11313,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
-echo "${as_me-configure}:11255: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me-configure}:11316: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -11260,7 +11321,7 @@ echo "${as_me-configure}:11255: testing Searching for ssl library in FIND_LINKAG
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lssl -lcrypto $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 11263 "configure"
+#line 11324 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11283,21 +11344,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11286: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11347: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11289: \$? = $ac_status" >&5
+  echo "$as_me:11350: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11353: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11295: \$? = $ac_status" >&5
+  echo "$as_me:11356: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
-echo "${as_me-configure}:11300: testing ... found ssl library in system ..." 1>&5
+echo "${as_me-configure}:11361: testing ... found ssl library in system ..." 1>&5
 
             cf_cv_find_linkage_ssl=yes
 else
@@ -11371,13 +11432,13 @@ test -d "$HOME" && \
           if test -d $cf_cv_library_path_ssl ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_ssl" 1>&6
 
-echo "${as_me-configure}:11374: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me-configure}:11435: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lssl -lcrypto $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_ssl"
             cat >conftest.$ac_ext <<_ACEOF
-#line 11380 "configure"
+#line 11441 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11400,21 +11461,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11403: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11464: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11406: \$? = $ac_status" >&5
+  echo "$as_me:11467: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11409: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11412: \$? = $ac_status" >&5
+  echo "$as_me:11473: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found ssl library in $cf_cv_library_path_ssl" 1>&6
 
-echo "${as_me-configure}:11417: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me-configure}:11478: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
                 cf_cv_find_linkage_ssl=yes
                 cf_cv_library_file_ssl="-lssl"
@@ -11493,7 +11554,7 @@ if test -n "$cf_cv_header_path_ssl" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11496 "configure"
+#line 11557 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11505,16 +11566,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11508: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11569: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11511: \$? = $ac_status" >&5
+  echo "$as_me:11572: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11517: \$? = $ac_status" >&5
+  echo "$as_me:11578: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11529,8 +11590,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:11532: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:11595: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -11567,8 +11630,10 @@ if test -n "$cf_cv_library_path_ssl" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:11570: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:11635: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -11578,10 +11643,10 @@ fi
     fi
     LIBS="-lssl -lcrypto $LIBS"
 
-echo "$as_me:11581: checking for X509 support" >&5
+echo "$as_me:11646: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 11584 "configure"
+#line 11649 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11603,16 +11668,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11606: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11671: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11609: \$? = $ac_status" >&5
+  echo "$as_me:11674: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11677: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11615: \$? = $ac_status" >&5
+  echo "$as_me:11680: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -11621,7 +11686,7 @@ cat conftest.$ac_ext >&5
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:11624: result: $cf_x509_support" >&5
+echo "$as_me:11689: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -11669,7 +11734,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11672 "configure"
+#line 11737 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11681,16 +11746,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11684: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11749: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11687: \$? = $ac_status" >&5
+  echo "$as_me:11752: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11755: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11693: \$? = $ac_status" >&5
+  echo "$as_me:11758: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11705,8 +11770,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:11708: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:11775: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -11746,7 +11813,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11749 "configure"
+#line 11816 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11758,16 +11825,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11761: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11828: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11764: \$? = $ac_status" >&5
+  echo "$as_me:11831: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11767: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11834: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11770: \$? = $ac_status" >&5
+  echo "$as_me:11837: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11782,8 +11849,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:11785: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:11854: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -11798,7 +11867,7 @@ echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
 fi
 
 	else
-{ { echo "$as_me:11801: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:11870: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -11821,8 +11890,10 @@ if test -n "$cf_searchpath/lib" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:11824: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:11895: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -11848,8 +11919,10 @@ if test -n "$cf_searchpath" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:11851: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:11924: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -11857,7 +11930,7 @@ echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
 fi
 
 	else
-{ { echo "$as_me:11860: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:11933: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -11877,10 +11950,10 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me-configure}:11880: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:11953: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11883 "configure"
+#line 11956 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11903,16 +11976,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11906: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11979: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11909: \$? = $ac_status" >&5
+  echo "$as_me:11982: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11915: \$? = $ac_status" >&5
+  echo "$as_me:11988: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_gnutls=yes
 else
@@ -11921,7 +11994,7 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_gnutls=no
 
-echo "${as_me-configure}:11924: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:11997: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -12002,11 +12075,11 @@ test -d "$oldincludedir" && {
       if test -d $cf_cv_header_path_gnutls ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me-configure}:12005: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me-configure}:12078: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
         cat >conftest.$ac_ext <<_ACEOF
-#line 12009 "configure"
+#line 12082 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12029,21 +12102,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12032: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12035: \$? = $ac_status" >&5
+  echo "$as_me:12108: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12041: \$? = $ac_status" >&5
+  echo "$as_me:12114: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me-configure}:12046: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me-configure}:12119: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
             cf_cv_find_linkage_gnutls=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -12061,7 +12134,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me-configure}:12064: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:12137: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -12129,13 +12202,13 @@ test -d "$HOME" && \
           if test -d $cf_cv_library_path_gnutls ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me-configure}:12132: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me-configure}:12205: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lgnutls -lgnutls-openssl -lgnutls-extra -lgnutls -lcrypt $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
             cat >conftest.$ac_ext <<_ACEOF
-#line 12138 "configure"
+#line 12211 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12158,21 +12231,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12161: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12234: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12164: \$? = $ac_status" >&5
+  echo "$as_me:12237: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12167: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12240: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12170: \$? = $ac_status" >&5
+  echo "$as_me:12243: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me-configure}:12175: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me-configure}:12248: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
                 cf_cv_find_linkage_gnutls=yes
                 cf_cv_library_file_gnutls="-lgnutls"
@@ -12244,7 +12317,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 12247 "configure"
+#line 12320 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12256,16 +12329,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12259: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12332: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12262: \$? = $ac_status" >&5
+  echo "$as_me:12335: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12268: \$? = $ac_status" >&5
+  echo "$as_me:12341: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12280,8 +12353,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:12283: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:12358: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -12317,8 +12392,10 @@ if test -n "$cf_cv_library_path_gnutls" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:12320: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:12397: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -12329,7 +12406,7 @@ fi
     LIBS="-lgnutls -lcrypt $LIBS"
   fi
 
-  echo "$as_me:12332: checking for SSL_connect in -lgnutls-openssl" >&5
+  echo "$as_me:12409: checking for SSL_connect in -lgnutls-openssl" >&5
 echo $ECHO_N "checking for SSL_connect in -lgnutls-openssl... $ECHO_C" >&6
 if test "${ac_cv_lib_gnutls_openssl_SSL_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12337,7 +12414,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12340 "configure"
+#line 12417 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12356,16 +12433,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12359: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12436: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12362: \$? = $ac_status" >&5
+  echo "$as_me:12439: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12368: \$? = $ac_status" >&5
+  echo "$as_me:12445: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -12376,12 +12453,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12379: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:12456: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_openssl_SSL_connect" >&6
 if test $ac_cv_lib_gnutls_openssl_SSL_connect = yes; then
   LIBS="-lgnutls-openssl $LIBS"
 else
-  echo "$as_me:12384: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:12461: checking for SSL_connect in -lgnutls-extra" >&5
 echo $ECHO_N "checking for SSL_connect in -lgnutls-extra... $ECHO_C" >&6
 if test "${ac_cv_lib_gnutls_extra_SSL_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12389,7 +12466,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12392 "configure"
+#line 12469 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12408,16 +12485,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12411: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12488: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12414: \$? = $ac_status" >&5
+  echo "$as_me:12491: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12417: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12420: \$? = $ac_status" >&5
+  echo "$as_me:12497: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -12428,22 +12505,22 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12431: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:12508: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_extra_SSL_connect" >&6
 if test $ac_cv_lib_gnutls_extra_SSL_connect = yes; then
   LIBS="-lgnutls-extra $LIBS"
 else
-  { { echo "$as_me:12436: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:12513: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
 
-echo "$as_me:12443: checking for X509 support" >&5
+echo "$as_me:12520: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 12446 "configure"
+#line 12523 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12465,16 +12542,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12468: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12545: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12471: \$? = $ac_status" >&5
+  echo "$as_me:12548: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12477: \$? = $ac_status" >&5
+  echo "$as_me:12554: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -12483,7 +12560,7 @@ cat conftest.$ac_ext >&5
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:12486: result: $cf_x509_support" >&5
+echo "$as_me:12563: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -12493,10 +12570,300 @@ EOF
 
 fi
 
+elif test "x$cf_cv_use_libnss_compat"  != xno ; then
+
+check=`pkg-config --version 2>/dev/null`
+if test -n "$check" ; then
+	cf_ssl_library=`pkg-config --libs nss`
+	cf_ssl_cflags=`pkg-config --cflags nss`
+else
+	# Without pkg-config, we'll kludge in some defaults
+	cf_ssl_library="-lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
+	cf_ssl_cflags="-I/usr/include/nss3 -I/usr/include/nspr4"
+fi
+cf_ssl_library="-lnss_compat_ossl $cf_ssl_library"
+
+case "$cf_cv_use_libnss_compat" in #(vi
+no) #(vi
+	cf_ssl_root=
+	;;
+yes) #(vi
+
+echo "$as_me:12592: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo $ECHO_N "checking for SSL_get_version in -lnss_compat_ossl... $ECHO_C" >&6
+if test "${ac_cv_lib_nss_compat_ossl_SSL_get_version+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line 12600 "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char SSL_get_version ();
+int
+main ()
+{
+SSL_get_version ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:12619: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12622: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:12625: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12628: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_nss_compat_ossl_SSL_get_version=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:12639: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "${ECHO_T}$ac_cv_lib_nss_compat_ossl_SSL_get_version" >&6
+if test $ac_cv_lib_nss_compat_ossl_SSL_get_version = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBNSS_COMPAT_OSSL 1
+EOF
+
+  LIBS="-lnss_compat_ossl $LIBS"
+
+else
+
+		cf_ssl_root=/usr/local/nss_compat_ossl
+		if test -d $cf_ssl_root ; then
+			test -n "$verbose" && echo "	assume it is in $cf_ssl_root" 1>&6
+
+echo "${as_me-configure}:12654: testing assume it is in $cf_ssl_root ..." 1>&5
+
+			cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
+		else
+			{ { echo "$as_me:12658: error: cannot find NSS compilant libraries" >&5
+echo "$as_me: error: cannot find NSS compilant libraries" >&2;}
+   { (exit 1); exit 1; }; }
+		fi
+
+fi
+
+	;;
+*)
+	if test -d $cf_cv_use_libnss_compat ; then
+		if test -d $cf_cv_use_libnss_compat/include ; then
+			cf_ssl_root=$cf_cv_use_libnss_compat
+		elif test -d $cf_cv_use_libnss_compat/../include ; then
+			cf_ssl_root=$cf_cv_use_libnss_compat/..
+		else
+			{ { echo "$as_me:12673: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
+echo "$as_me: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&2;}
+   { (exit 1); exit 1; }; }
+		fi
+		cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
+	else
+		{ echo "$as_me:12679: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
+	fi
+	;;
+esac
+LIBS="$cf_ssl_library $LIBS"
+
+cf_ssl_subincs=yes
+if test -n "$cf_ssl_root" ; then
+	if test -d $cf_ssl_root/include ; then
+		cf_ssl_cflags="-I$cf_ssl_root/include  $cf_ssl_cflags"
+		test -d $cf_ssl_root/include/nss_compat_ossl || cf_ssl_subincs=no
+	fi
+fi
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_ssl_cflags
+do
+case $cf_fix_cppflags in
+no)
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case $cf_add_cflags in
+		-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			&& test -z "${cf_tst_cflags}" \
+			&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+	;;
+yes)
+	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	&& test -z "${cf_tst_cflags}" \
+	&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+if test "$cf_ssl_subincs" = yes ; then
+echo "$as_me:12763: checking for NSS compilant include directory" >&5
+echo $ECHO_N "checking for NSS compilant include directory... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line 12766 "configure"
+#include "confdefs.h"
+
+#include <stdio.h>
+#include <nss_compat_ossl/nss_compat_ossl.h>
+int
+main ()
+{
+SSL_shutdown((SSL *)0)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:12780: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:12783: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:12786: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12789: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_ssl_incl=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_ssl_incl=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:12798: result: $cf_ssl_incl" >&5
+echo "${ECHO_T}$cf_ssl_incl" >&6
+test "$cf_ssl_incl" = yes && cat >>confdefs.h <<\EOF
+#define USE_NSS_COMPAT_INCL 1
+EOF
+
+fi
+
+echo "$as_me:12806: checking if we can link to NSS compilant library" >&5
+echo $ECHO_N "checking if we can link to NSS compilant library... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line 12809 "configure"
+#include "confdefs.h"
+
+#include <stdio.h>
+#ifdef USE_NSS_COMPAT_INCL
+#include <nss_compat_ossl/nss_compat_ossl.h>
+#else
+#include <ssl.h>
+#endif
+
+int
+main ()
+{
+SSL_shutdown((SSL *)0)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:12828: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12831: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:12834: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12837: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_ssl_library=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_ssl_library=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+echo "$as_me:12846: result: $cf_ssl_library" >&5
+echo "${ECHO_T}$cf_ssl_library" >&6
+if test "$cf_ssl_library" = yes ; then
+	cat >>confdefs.h <<\EOF
+#define USE_SSL 1
+EOF
+
+	cat >>confdefs.h <<\EOF
+#define USE_X509_SUPPORT 1
+EOF
+
+else
+	{ { echo "$as_me:12858: error: Cannot link with NSS compilant libraries" >&5
+echo "$as_me: error: Cannot link with NSS compilant libraries" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
 fi
 
 ### check for ipv6 support
-echo "$as_me:12499: checking whether to enable ipv6" >&5
+echo "$as_me:12866: checking whether to enable ipv6" >&5
 echo $ECHO_N "checking whether to enable ipv6... $ECHO_C" >&6
 
 # Check whether --enable-ipv6 or --disable-ipv6 was given.
@@ -12512,11 +12879,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:12515: result: $enableval" >&5
+echo "$as_me:12882: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:12519: checking ipv6 stack type" >&5
+echo "$as_me:12886: checking ipv6 stack type" >&5
 echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6
 if test "${cf_cv_ipv6type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12537,7 +12904,7 @@ do
 		;;
 	inria) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 12540 "configure"
+#line 12907 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -12554,7 +12921,7 @@ rm -f conftest*
 		;;
 	kame) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 12557 "configure"
+#line 12924 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -12571,7 +12938,7 @@ rm -f conftest*
 		;;
 	linux-glibc) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 12574 "configure"
+#line 12941 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -12597,7 +12964,7 @@ rm -f conftest*
 		;;
 	toshiba) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12600 "configure"
+#line 12967 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -12614,7 +12981,7 @@ rm -f conftest*
 		;;
 	v6d) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12617 "configure"
+#line 12984 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -12631,7 +12998,7 @@ rm -f conftest*
 		;;
 	zeta)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12634 "configure"
+#line 13001 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -12653,13 +13020,13 @@ rm -f conftest*
 done
 
 fi
-echo "$as_me:12656: result: $cf_cv_ipv6type" >&5
+echo "$as_me:13023: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:12662: checking for IPv6 library if required" >&5
+echo "$as_me:13029: checking for IPv6 library if required" >&5
 echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6
 case $cf_cv_ipv6type in #(vi
 solaris) #(vi
@@ -12689,13 +13056,13 @@ zeta)
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:12692: result: $cf_ipv6lib" >&5
+echo "$as_me:13059: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12698 "configure"
+#line 13065 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12711,16 +13078,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12714: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13081: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12717: \$? = $ac_status" >&5
+  echo "$as_me:13084: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13087: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12723: \$? = $ac_status" >&5
+  echo "$as_me:13090: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12828,7 +13195,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 12831 "configure"
+#line 13198 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12840,16 +13207,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12843: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13210: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12846: \$? = $ac_status" >&5
+  echo "$as_me:13213: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13216: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12852: \$? = $ac_status" >&5
+  echo "$as_me:13219: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12864,8 +13231,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:12867: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:13236: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -12890,13 +13259,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 	eval 'cf_cv_have_lib_'$cf_ipv6lib'=no'
 	cf_libdir=""
-	echo "$as_me:12893: checking for getaddrinfo" >&5
+	echo "$as_me:13262: checking for getaddrinfo" >&5
 echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6
 if test "${ac_cv_func_getaddrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12899 "configure"
+#line 13268 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo (); below.  */
@@ -12927,16 +13296,16 @@ f = getaddrinfo;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12930: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13299: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12933: \$? = $ac_status" >&5
+  echo "$as_me:13302: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13305: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12939: \$? = $ac_status" >&5
+  echo "$as_me:13308: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -12946,18 +13315,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12949: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:13318: result: $ac_cv_func_getaddrinfo" >&5
 echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6
 if test $ac_cv_func_getaddrinfo = yes; then
   eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:12956: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:13325: checking for getaddrinfo in -l$cf_ipv6lib" >&5
 echo $ECHO_N "checking for getaddrinfo in -l$cf_ipv6lib... $ECHO_C" >&6
 		LIBS="-l$cf_ipv6lib $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12960 "configure"
+#line 13329 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12973,25 +13342,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12976: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13345: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12979: \$? = $ac_status" >&5
+  echo "$as_me:13348: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12985: \$? = $ac_status" >&5
+  echo "$as_me:13354: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12987: result: yes" >&5
+  echo "$as_me:13356: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:12994: result: no" >&5
+echo "$as_me:13363: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -13052,11 +13421,11 @@ test -d "$HOME" && \
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:13055: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:13424: checking for -l$cf_ipv6lib in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_ipv6lib in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 13059 "configure"
+#line 13428 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13072,25 +13441,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13075: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13444: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13078: \$? = $ac_status" >&5
+  echo "$as_me:13447: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13084: \$? = $ac_status" >&5
+  echo "$as_me:13453: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:13086: result: yes" >&5
+  echo "$as_me:13455: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:13093: result: no" >&5
+echo "$as_me:13462: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -13105,7 +13474,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib
 
 	if test $cf_found_library = no ; then
-		{ { echo "$as_me:13108: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:13477: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
 from an appropriate IPv6 kit and compile beforehand." >&5
 echo "$as_me: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
 from an appropriate IPv6 kit and compile beforehand." >&2;}
@@ -13113,7 +13482,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:13116: checking working getaddrinfo" >&5
+echo "$as_me:13485: checking working getaddrinfo" >&5
 echo $ECHO_N "checking working getaddrinfo... $ECHO_C" >&6
 if test "${cf_cv_getaddrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13123,7 +13492,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13126 "configure"
+#line 13495 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13203,15 +13572,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13206: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13575: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13209: \$? = $ac_status" >&5
+  echo "$as_me:13578: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13214: \$? = $ac_status" >&5
+  echo "$as_me:13583: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -13224,7 +13593,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:13227: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:13596: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -13239,12 +13608,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:13242: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:13611: WARNING: You must get working getaddrinfo() function,
 or you can specify \"--disable-ipv6\"" >&5
 echo "$as_me: WARNING: You must get working getaddrinfo() function,
 or you can specify \"--disable-ipv6\"" >&2;}
 	else
-		{ echo "$as_me:13247: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:13616: WARNING: The getaddrinfo() implementation on your system seems be buggy.
 You should upgrade your system library to the newest version
 of GNU C library (aka glibc)." >&5
 echo "$as_me: WARNING: The getaddrinfo() implementation on your system seems be buggy.
@@ -13255,7 +13624,7 @@ fi
 
 fi
 
-echo "$as_me:13258: checking for screen type" >&5
+echo "$as_me:13627: checking for screen type" >&5
 echo $ECHO_N "checking for screen type... $ECHO_C" >&6
 if test "${cf_cv_screen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13269,7 +13638,7 @@ case $withval in
 curses|ncurses|ncursesw|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-*)	{ { echo "$as_me:13272: error: Unexpected value" >&5
+*)	{ { echo "$as_me:13641: error: Unexpected value" >&5
 echo "$as_me: error: Unexpected value" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -13278,7 +13647,7 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:13281: result: $cf_cv_screen" >&5
+echo "$as_me:13650: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
@@ -13313,7 +13682,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:13316: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:13685: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -13332,7 +13701,7 @@ dft_color_style=yes
 case $cf_cv_screen in
 curses)
 
-echo "$as_me:13335: checking for extra include directories" >&5
+echo "$as_me:13704: checking for extra include directories" >&5
 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
 if test "${cf_cv_curses_incdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13352,11 +13721,11 @@ sunos3*|sunos4*)
 esac
 
 fi
-echo "$as_me:13355: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:13724: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS"
 
-echo "$as_me:13359: checking if we have identified curses headers" >&5
+echo "$as_me:13728: checking if we have identified curses headers" >&5
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13370,7 +13739,7 @@ for cf_header in \
 	ncurses/ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 13373 "configure"
+#line 13742 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -13382,16 +13751,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13385: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13754: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13388: \$? = $ac_status" >&5
+  echo "$as_me:13757: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13394: \$? = $ac_status" >&5
+  echo "$as_me:13763: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -13402,11 +13771,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:13405: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:13774: result: $cf_cv_ncurses_header" >&5
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
-	{ { echo "$as_me:13409: error: No curses header-files found" >&5
+	{ { echo "$as_me:13778: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -13416,23 +13785,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13419: checking for $ac_header" >&5
+echo "$as_me:13788: 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 13425 "configure"
+#line 13794 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13429: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13798: \"$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:13435: \$? = $ac_status" >&5
+  echo "$as_me:13804: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13451,7 +13820,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:13454: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13823: 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
@@ -13461,7 +13830,7 @@ EOF
 fi
 done
 
-echo "$as_me:13464: checking for terminfo header" >&5
+echo "$as_me:13833: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13479,7 +13848,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 13482 "configure"
+#line 13851 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -13494,16 +13863,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13497: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13866: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13500: \$? = $ac_status" >&5
+  echo "$as_me:13869: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13506: \$? = $ac_status" >&5
+  echo "$as_me:13875: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -13519,7 +13888,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:13522: result: $cf_cv_term_header" >&5
+echo "$as_me:13891: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -13548,7 +13917,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:13551: checking for ncurses version" >&5
+echo "$as_me:13920: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13574,10 +13943,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:13577: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:13946: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:13580: \$? = $ac_status" >&5
+  echo "$as_me:13949: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -13587,7 +13956,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13590 "configure"
+#line 13959 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -13612,15 +13981,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13615: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13618: \$? = $ac_status" >&5
+  echo "$as_me:13987: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13989: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13623: \$? = $ac_status" >&5
+  echo "$as_me:13992: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -13634,16 +14003,16 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:13637: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:14006: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:13643: checking if we have identified curses libraries" >&5
+echo "$as_me:14012: checking if we have identified curses libraries" >&5
 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 13646 "configure"
+#line 14015 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -13655,16 +14024,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13658: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14027: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13661: \$? = $ac_status" >&5
+  echo "$as_me:14030: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13664: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13667: \$? = $ac_status" >&5
+  echo "$as_me:14036: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -13673,13 +14042,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:13676: result: $cf_result" >&5
+echo "$as_me:14045: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case $host_os in #(vi
 freebsd*) #(vi
-    echo "$as_me:13682: checking for tgoto in -lmytinfo" >&5
+    echo "$as_me:14051: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13687,7 +14056,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13690 "configure"
+#line 14059 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13706,16 +14075,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13709: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14078: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13712: \$? = $ac_status" >&5
+  echo "$as_me:14081: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13718: \$? = $ac_status" >&5
+  echo "$as_me:14087: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -13726,7 +14095,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13729: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:14098: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   LIBS="-lmytinfo $LIBS"
@@ -13734,7 +14103,7 @@ fi
 
     ;;
 hpux10.*) #(vi
-    echo "$as_me:13737: checking for initscr in -lcur_colr" >&5
+    echo "$as_me:14106: checking for initscr in -lcur_colr" >&5
 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13742,7 +14111,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13745 "configure"
+#line 14114 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13761,16 +14130,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13764: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14133: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13767: \$? = $ac_status" >&5
+  echo "$as_me:14136: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13773: \$? = $ac_status" >&5
+  echo "$as_me:14142: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -13781,7 +14150,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13784: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:14153: result: $ac_cv_lib_cur_colr_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
 if test $ac_cv_lib_cur_colr_initscr = yes; then
 
@@ -13790,7 +14159,7 @@ if test $ac_cv_lib_cur_colr_initscr = yes; then
 
 else
 
-    echo "$as_me:13793: checking for initscr in -lHcurses" >&5
+    echo "$as_me:14162: checking for initscr in -lHcurses" >&5
 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13798,7 +14167,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13801 "configure"
+#line 14170 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13817,16 +14186,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13820: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14189: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13823: \$? = $ac_status" >&5
+  echo "$as_me:14192: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14195: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13829: \$? = $ac_status" >&5
+  echo "$as_me:14198: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -13837,7 +14206,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13840: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:14209: result: $ac_cv_lib_Hcurses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
 if test $ac_cv_lib_Hcurses_initscr = yes; then
 
@@ -13870,8 +14239,10 @@ if test -n "/lib" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:13873: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:14244: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -13899,8 +14270,10 @@ if test -n "/usr/5lib" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:13902: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:14275: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -13927,13 +14300,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 
     # Check for library containing tgoto.  Do this before curses library
     # because it may be needed to link the test-case for initscr.
-    echo "$as_me:13930: checking for tgoto" >&5
+    echo "$as_me:14303: checking for tgoto" >&5
 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
 if test "${ac_cv_func_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13936 "configure"
+#line 14309 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -13964,16 +14337,16 @@ f = tgoto;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13967: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14340: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13970: \$? = $ac_status" >&5
+  echo "$as_me:14343: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13976: \$? = $ac_status" >&5
+  echo "$as_me:14349: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -13983,7 +14356,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13986: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:14359: result: $ac_cv_func_tgoto" >&5
 echo "${ECHO_T}$ac_cv_func_tgoto" >&6
 if test $ac_cv_func_tgoto = yes; then
   cf_term_lib=predefined
@@ -13992,7 +14365,7 @@ else
         for cf_term_lib in $cf_check_list termcap termlib unknown
         do
             as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:13995: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:14368: checking for tgoto in -l$cf_term_lib" >&5
 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14000,7 +14373,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14003 "configure"
+#line 14376 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14019,16 +14392,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14022: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14395: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14025: \$? = $ac_status" >&5
+  echo "$as_me:14398: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14028: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14401: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14031: \$? = $ac_status" >&5
+  echo "$as_me:14404: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -14039,7 +14412,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14042: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:14415: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break
@@ -14054,7 +14427,7 @@ fi
     for cf_curs_lib in $cf_check_list xcurses jcurses unknown
     do
         as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
-echo "$as_me:14057: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:14430: checking for initscr in -l$cf_curs_lib" >&5
 echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14062,7 +14435,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14065 "configure"
+#line 14438 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14081,16 +14454,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14084: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14457: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14087: \$? = $ac_status" >&5
+  echo "$as_me:14460: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14090: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14093: \$? = $ac_status" >&5
+  echo "$as_me:14466: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -14101,23 +14474,23 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14104: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:14477: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break
 fi
 
     done
-    test $cf_curs_lib = unknown && { { echo "$as_me:14111: error: no curses library found" >&5
+    test $cf_curs_lib = unknown && { { echo "$as_me:14484: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 
     LIBS="-l$cf_curs_lib $cf_save_LIBS"
     if test "$cf_term_lib" = unknown ; then
-        echo "$as_me:14117: checking if we can link with $cf_curs_lib library" >&5
+        echo "$as_me:14490: checking if we can link with $cf_curs_lib library" >&5
 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
         cat >conftest.$ac_ext <<_ACEOF
-#line 14120 "configure"
+#line 14493 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -14129,16 +14502,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14132: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14505: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14135: \$? = $ac_status" >&5
+  echo "$as_me:14508: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14138: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14511: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14141: \$? = $ac_status" >&5
+  echo "$as_me:14514: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -14147,18 +14520,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-        echo "$as_me:14150: result: $cf_result" >&5
+        echo "$as_me:14523: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-        test $cf_result = no && { { echo "$as_me:14152: error: Cannot link curses library" >&5
+        test $cf_result = no && { { echo "$as_me:14525: error: Cannot link curses library" >&5
 echo "$as_me: error: Cannot link curses library" >&2;}
    { (exit 1); exit 1; }; }
     elif test "$cf_curs_lib" = "$cf_term_lib" ; then
         :
     elif test "$cf_term_lib" != predefined ; then
-        echo "$as_me:14158: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+        echo "$as_me:14531: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
         cat >conftest.$ac_ext <<_ACEOF
-#line 14161 "configure"
+#line 14534 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -14170,16 +14543,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14173: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14546: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14176: \$? = $ac_status" >&5
+  echo "$as_me:14549: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14182: \$? = $ac_status" >&5
+  echo "$as_me:14555: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -14188,7 +14561,7 @@ cat conftest.$ac_ext >&5
 
             LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
             cat >conftest.$ac_ext <<_ACEOF
-#line 14191 "configure"
+#line 14564 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -14200,16 +14573,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14576: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14206: \$? = $ac_status" >&5
+  echo "$as_me:14579: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14212: \$? = $ac_status" >&5
+  echo "$as_me:14585: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -14221,13 +14594,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-        echo "$as_me:14224: result: $cf_result" >&5
+        echo "$as_me:14597: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
     fi
 fi
 fi
 
-echo "$as_me:14230: checking for curses performance tradeoff" >&5
+echo "$as_me:14603: checking for curses performance tradeoff" >&5
 echo $ECHO_N "checking for curses performance tradeoff... $ECHO_C" >&6
 if test "${cf_cv_curs_performance+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14235,7 +14608,7 @@ else
 
     cf_cv_curs_performance=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 14238 "configure"
+#line 14611 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -14254,20 +14627,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14257: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14630: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14260: \$? = $ac_status" >&5
+  echo "$as_me:14633: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14266: \$? = $ac_status" >&5
+  echo "$as_me:14639: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14270 "configure"
+#line 14643 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -14287,16 +14660,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14290: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14663: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14293: \$? = $ac_status" >&5
+  echo "$as_me:14666: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14296: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14299: \$? = $ac_status" >&5
+  echo "$as_me:14672: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -14311,20 +14684,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:14314: result: $cf_cv_curs_performance" >&5
+echo "$as_me:14687: result: $cf_cv_curs_performance" >&5
 echo "${ECHO_T}$cf_cv_curs_performance" >&6
 test $cf_cv_curs_performance = yes && cat >>confdefs.h <<\EOF
 #define CURS_PERFORMANCE 1
 EOF
 
-echo "$as_me:14320: checking for curses touchline function" >&5
+echo "$as_me:14693: checking for curses touchline function" >&5
 echo $ECHO_N "checking for curses touchline function... $ECHO_C" >&6
 if test "${cf_cv_curs_touchline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14327 "configure"
+#line 14700 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -14337,23 +14710,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14340: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14713: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14343: \$? = $ac_status" >&5
+  echo "$as_me:14716: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14719: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14349: \$? = $ac_status" >&5
+  echo "$as_me:14722: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=bsd
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 14356 "configure"
+#line 14729 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -14366,16 +14739,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14369: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14742: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14372: \$? = $ac_status" >&5
+  echo "$as_me:14745: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14378: \$? = $ac_status" >&5
+  echo "$as_me:14751: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -14387,7 +14760,7 @@ 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:14390: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:14763: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in #(vi
 bsd) #(vi
@@ -14414,7 +14787,7 @@ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-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:14417: checking for $ac_word" >&5
+echo "$as_me:14790: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14431,7 +14804,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_NCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:14434: found $ac_dir/$ac_word" >&5
+   echo "$as_me:14807: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -14442,10 +14815,10 @@ fi
 NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
 
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:14445: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:14818: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:14448: result: no" >&5
+  echo "$as_me:14821: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -14503,7 +14876,7 @@ if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root"
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14506 "configure"
+#line 14879 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14515,16 +14888,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14518: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14891: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14521: \$? = $ac_status" >&5
+  echo "$as_me:14894: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14524: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14527: \$? = $ac_status" >&5
+  echo "$as_me:14900: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14539,8 +14912,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:14542: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:14917: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -14556,7 +14931,7 @@ fi
 
 }
 
-echo "$as_me:14559: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:14934: checking for $cf_ncuhdr_root header in include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14568,7 +14943,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14571 "configure"
+#line 14946 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -14592,16 +14967,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14595: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14970: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14598: \$? = $ac_status" >&5
+  echo "$as_me:14973: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14601: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14604: \$? = $ac_status" >&5
+  echo "$as_me:14979: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -14616,14 +14991,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:14619: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:14994: result: $cf_cv_ncurses_h" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
 
-echo "$as_me:14626: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:15001: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14730,7 +15105,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14733 "configure"
+#line 15108 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14742,16 +15117,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14745: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15120: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14748: \$? = $ac_status" >&5
+  echo "$as_me:15123: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14754: \$? = $ac_status" >&5
+  echo "$as_me:15129: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14766,8 +15141,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:14769: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:15146: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -14787,7 +15164,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14790 "configure"
+#line 15167 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -14811,16 +15188,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14814: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15191: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14817: \$? = $ac_status" >&5
+  echo "$as_me:15194: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15197: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14823: \$? = $ac_status" >&5
+  echo "$as_me:15200: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -14841,12 +15218,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:14844: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:15221: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:14849: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:15226: result: $cf_cv_ncurses_h2" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -14879,7 +15256,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14882 "configure"
+#line 15259 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14891,16 +15268,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14894: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15271: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14897: \$? = $ac_status" >&5
+  echo "$as_me:15274: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14903: \$? = $ac_status" >&5
+  echo "$as_me:15280: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14915,8 +15292,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:14918: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:15297: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -14958,7 +15337,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:14961: checking for terminfo header" >&5
+echo "$as_me:15340: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14976,7 +15355,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 14979 "configure"
+#line 15358 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -14991,16 +15370,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14994: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15373: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14997: \$? = $ac_status" >&5
+  echo "$as_me:15376: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15003: \$? = $ac_status" >&5
+  echo "$as_me:15382: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -15016,7 +15395,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:15019: result: $cf_cv_term_header" >&5
+echo "$as_me:15398: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -15050,7 +15429,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:15053: checking for ncurses version" >&5
+echo "$as_me:15432: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15076,10 +15455,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:15079: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:15458: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:15082: \$? = $ac_status" >&5
+  echo "$as_me:15461: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -15089,7 +15468,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15092 "configure"
+#line 15471 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -15114,15 +15493,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15117: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15496: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15120: \$? = $ac_status" >&5
+  echo "$as_me:15499: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15125: \$? = $ac_status" >&5
+  echo "$as_me:15504: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -15136,7 +15515,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:15139: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:15518: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
@@ -15148,7 +15527,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:15151: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:15530: checking for Gpm_Open in -lgpm" >&5
 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15156,7 +15535,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15159 "configure"
+#line 15538 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15175,16 +15554,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15557: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15181: \$? = $ac_status" >&5
+  echo "$as_me:15560: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15187: \$? = $ac_status" >&5
+  echo "$as_me:15566: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -15195,10 +15574,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15198: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:15577: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:15201: checking for initscr in -lgpm" >&5
+  echo "$as_me:15580: checking for initscr in -lgpm" >&5
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15206,7 +15585,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15209 "configure"
+#line 15588 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15225,16 +15604,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15228: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15607: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15231: \$? = $ac_status" >&5
+  echo "$as_me:15610: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15234: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15613: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15237: \$? = $ac_status" >&5
+  echo "$as_me:15616: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -15245,7 +15624,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15248: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:15627: result: $ac_cv_lib_gpm_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
@@ -15260,7 +15639,7 @@ freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:15263: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:15642: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15268,7 +15647,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15271 "configure"
+#line 15650 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15287,16 +15666,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15290: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15669: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15293: \$? = $ac_status" >&5
+  echo "$as_me:15672: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15296: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15675: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15299: \$? = $ac_status" >&5
+  echo "$as_me:15678: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -15307,7 +15686,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15310: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:15689: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
@@ -15339,8 +15718,10 @@ if test -n "$cf_cv_curses_dir/lib" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:15342: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:15723: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -15352,13 +15733,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:15355: checking for initscr" >&5
+	echo "$as_me:15736: checking for initscr" >&5
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15361 "configure"
+#line 15742 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -15389,16 +15770,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15392: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15773: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15395: \$? = $ac_status" >&5
+  echo "$as_me:15776: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15779: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15401: \$? = $ac_status" >&5
+  echo "$as_me:15782: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -15408,18 +15789,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15411: result: $ac_cv_func_initscr" >&5
+echo "$as_me:15792: result: $ac_cv_func_initscr" >&5
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:15418: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:15799: checking for initscr in -l$cf_nculib_root" >&5
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 15422 "configure"
+#line 15803 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -15431,25 +15812,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15434: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15815: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15437: \$? = $ac_status" >&5
+  echo "$as_me:15818: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15821: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15443: \$? = $ac_status" >&5
+  echo "$as_me:15824: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:15445: result: yes" >&5
+  echo "$as_me:15826: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:15452: result: no" >&5
+echo "$as_me:15833: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -15510,11 +15891,11 @@ test -d "$HOME" && \
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:15513: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:15894: checking for -l$cf_nculib_root in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 15517 "configure"
+#line 15898 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -15526,25 +15907,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15529: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15910: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15532: \$? = $ac_status" >&5
+  echo "$as_me:15913: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15916: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15538: \$? = $ac_status" >&5
+  echo "$as_me:15919: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:15540: result: yes" >&5
+  echo "$as_me:15921: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:15547: result: no" >&5
+echo "$as_me:15928: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -15559,7 +15940,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:15562: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:15943: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -15567,7 +15948,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:15570: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:15951: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
@@ -15577,7 +15958,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 15580 "configure"
+#line 15961 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -15589,23 +15970,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15592: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15973: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15595: \$? = $ac_status" >&5
+  echo "$as_me:15976: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15601: \$? = $ac_status" >&5
+  echo "$as_me:15982: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:15603: result: yes" >&5
+  echo "$as_me:15984: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:15608: result: no" >&5
+echo "$as_me:15989: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -15623,7 +16004,7 @@ fi
 	;;
 ncursesw)
 
-echo "$as_me:15626: checking for multibyte character support" >&5
+echo "$as_me:16007: checking for multibyte character support" >&5
 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
 if test "${cf_cv_utf8_lib+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15631,7 +16012,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 15634 "configure"
+#line 16015 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -15644,16 +16025,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15647: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16028: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15650: \$? = $ac_status" >&5
+  echo "$as_me:16031: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15656: \$? = $ac_status" >&5
+  echo "$as_me:16037: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -15661,7 +16042,7 @@ else
 cat conftest.$ac_ext >&5
 LIBS="-lutf8 $LIBS"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 15664 "configure"
+#line 16045 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -15674,16 +16055,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15677: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15680: \$? = $ac_status" >&5
+  echo "$as_me:16061: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15686: \$? = $ac_status" >&5
+  echo "$as_me:16067: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=add-on
 else
@@ -15697,7 +16078,7 @@ 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:15700: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:16081: result: $cf_cv_utf8_lib" >&5
 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
 
 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
@@ -15717,7 +16098,7 @@ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-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:15720: checking for $ac_word" >&5
+echo "$as_me:16101: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15734,7 +16115,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_NCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:15737: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16118: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -15745,10 +16126,10 @@ fi
 NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
 
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:15748: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:16129: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:15751: result: no" >&5
+  echo "$as_me:16132: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -15806,7 +16187,7 @@ if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root"
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15809 "configure"
+#line 16190 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15818,16 +16199,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15821: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16202: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15824: \$? = $ac_status" >&5
+  echo "$as_me:16205: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15830: \$? = $ac_status" >&5
+  echo "$as_me:16211: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15842,8 +16223,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:15845: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:16228: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -15859,7 +16242,7 @@ fi
 
 }
 
-echo "$as_me:15862: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:16245: checking for $cf_ncuhdr_root header in include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15871,7 +16254,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 15874 "configure"
+#line 16257 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -15903,16 +16286,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15906: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16289: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15909: \$? = $ac_status" >&5
+  echo "$as_me:16292: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16295: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15915: \$? = $ac_status" >&5
+  echo "$as_me:16298: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -15927,14 +16310,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:15930: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:16313: result: $cf_cv_ncurses_h" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
 
-echo "$as_me:15937: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:16320: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16041,7 +16424,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 16044 "configure"
+#line 16427 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16053,16 +16436,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16056: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16439: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16059: \$? = $ac_status" >&5
+  echo "$as_me:16442: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16065: \$? = $ac_status" >&5
+  echo "$as_me:16448: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16077,8 +16460,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:16080: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:16465: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -16098,7 +16483,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16101 "configure"
+#line 16486 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -16122,16 +16507,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16125: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16510: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16128: \$? = $ac_status" >&5
+  echo "$as_me:16513: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16134: \$? = $ac_status" >&5
+  echo "$as_me:16519: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -16152,12 +16537,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:16155: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:16540: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:16160: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:16545: result: $cf_cv_ncurses_h2" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -16190,7 +16575,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 16193 "configure"
+#line 16578 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16202,16 +16587,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16205: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16590: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16208: \$? = $ac_status" >&5
+  echo "$as_me:16593: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16214: \$? = $ac_status" >&5
+  echo "$as_me:16599: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16226,8 +16611,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:16229: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:16616: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -16269,7 +16656,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:16272: checking for terminfo header" >&5
+echo "$as_me:16659: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16287,7 +16674,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 16290 "configure"
+#line 16677 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -16302,16 +16689,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16305: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16692: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16308: \$? = $ac_status" >&5
+  echo "$as_me:16695: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16698: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16314: \$? = $ac_status" >&5
+  echo "$as_me:16701: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -16327,7 +16714,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:16330: result: $cf_cv_term_header" >&5
+echo "$as_me:16717: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -16361,7 +16748,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:16364: checking for ncurses version" >&5
+echo "$as_me:16751: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16387,10 +16774,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:16390: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:16777: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:16393: \$? = $ac_status" >&5
+  echo "$as_me:16780: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -16400,7 +16787,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16403 "configure"
+#line 16790 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -16425,15 +16812,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:16428: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16815: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16431: \$? = $ac_status" >&5
+  echo "$as_me:16818: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:16433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16436: \$? = $ac_status" >&5
+  echo "$as_me:16823: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -16447,7 +16834,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:16450: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:16837: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
@@ -16459,7 +16846,7 @@ cf_nculib_root=ncursesw
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:16462: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:16849: checking for Gpm_Open in -lgpm" >&5
 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16467,7 +16854,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16470 "configure"
+#line 16857 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16486,16 +16873,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16876: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16492: \$? = $ac_status" >&5
+  echo "$as_me:16879: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16498: \$? = $ac_status" >&5
+  echo "$as_me:16885: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -16506,10 +16893,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16509: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:16896: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:16512: checking for initscr in -lgpm" >&5
+  echo "$as_me:16899: checking for initscr in -lgpm" >&5
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16517,7 +16904,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16520 "configure"
+#line 16907 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16536,16 +16923,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16539: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16926: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16542: \$? = $ac_status" >&5
+  echo "$as_me:16929: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16548: \$? = $ac_status" >&5
+  echo "$as_me:16935: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -16556,7 +16943,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16559: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:16946: result: $ac_cv_lib_gpm_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
@@ -16571,7 +16958,7 @@ freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:16574: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:16961: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16579,7 +16966,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16582 "configure"
+#line 16969 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16598,16 +16985,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16601: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16988: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16604: \$? = $ac_status" >&5
+  echo "$as_me:16991: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16607: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16994: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16610: \$? = $ac_status" >&5
+  echo "$as_me:16997: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -16618,7 +17005,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16621: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:17008: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
@@ -16650,8 +17037,10 @@ if test -n "$cf_cv_curses_dir/lib" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:16653: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:17042: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -16663,13 +17052,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:16666: checking for initscr" >&5
+	echo "$as_me:17055: checking for initscr" >&5
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16672 "configure"
+#line 17061 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -16700,16 +17089,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17092: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16706: \$? = $ac_status" >&5
+  echo "$as_me:17095: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16712: \$? = $ac_status" >&5
+  echo "$as_me:17101: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -16719,18 +17108,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16722: result: $ac_cv_func_initscr" >&5
+echo "$as_me:17111: result: $ac_cv_func_initscr" >&5
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:16729: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:17118: checking for initscr in -l$cf_nculib_root" >&5
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16733 "configure"
+#line 17122 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -16742,25 +17131,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16745: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17134: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16748: \$? = $ac_status" >&5
+  echo "$as_me:17137: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16754: \$? = $ac_status" >&5
+  echo "$as_me:17143: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:16756: result: yes" >&5
+  echo "$as_me:17145: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:16763: result: no" >&5
+echo "$as_me:17152: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -16821,11 +17210,11 @@ test -d "$HOME" && \
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:16824: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:17213: checking for -l$cf_nculib_root in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 16828 "configure"
+#line 17217 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -16837,25 +17226,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16840: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17229: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16843: \$? = $ac_status" >&5
+  echo "$as_me:17232: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17235: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16849: \$? = $ac_status" >&5
+  echo "$as_me:17238: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:16851: result: yes" >&5
+  echo "$as_me:17240: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:16858: result: no" >&5
+echo "$as_me:17247: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -16870,7 +17259,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:16873: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:17262: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -16878,7 +17267,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:16881: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:17270: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
@@ -16888,7 +17277,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16891 "configure"
+#line 17280 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -16900,23 +17289,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16903: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17292: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16906: \$? = $ac_status" >&5
+  echo "$as_me:17295: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16912: \$? = $ac_status" >&5
+  echo "$as_me:17301: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:16914: result: yes" >&5
+  echo "$as_me:17303: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:16919: result: no" >&5
+echo "$as_me:17308: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -16939,14 +17328,14 @@ pdcurses)
 	;;
 slang)
 
-echo "$as_me:16942: checking for slang header file" >&5
+echo "$as_me:17331: checking for slang header file" >&5
 echo $ECHO_N "checking for slang header file... $ECHO_C" >&6
 if test "${cf_cv_slang_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16949 "configure"
+#line 17338 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -16958,16 +17347,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16961: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17350: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16964: \$? = $ac_status" >&5
+  echo "$as_me:17353: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16970: \$? = $ac_status" >&5
+  echo "$as_me:17359: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -17058,14 +17447,14 @@ test -d "$oldincludedir" && {
 		done
 		test -n "$cf_cv_slang_header" && break
 	done
-	test -z "$cf_cv_slang_header" && { { echo "$as_me:17061: error: not found" >&5
+	test -z "$cf_cv_slang_header" && { { echo "$as_me:17450: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:17068: result: $cf_cv_slang_header" >&5
+echo "$as_me:17457: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 cat >>confdefs.h <<\EOF
 #define USE_SLANG 1
@@ -17102,7 +17491,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 17105 "configure"
+#line 17494 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17114,16 +17503,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17117: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17506: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17120: \$? = $ac_status" >&5
+  echo "$as_me:17509: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17126: \$? = $ac_status" >&5
+  echo "$as_me:17515: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17138,8 +17527,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:17141: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:17532: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -17158,14 +17549,14 @@ esac
 
 # There's an unofficial set of patches for slang that gives it some limited
 # UTF8 capability.  Unfortunately it won't compile unless one defines UTF8.
-echo "$as_me:17161: checking if we must define UTF8" >&5
+echo "$as_me:17552: checking if we must define UTF8" >&5
 echo $ECHO_N "checking if we must define UTF8... $ECHO_C" >&6
 if test "${cf_cv_slang_utf8+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17168 "configure"
+#line 17559 "configure"
 #include "confdefs.h"
 
 #include <slang.h>
@@ -17178,16 +17569,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17181: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17572: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17184: \$? = $ac_status" >&5
+  echo "$as_me:17575: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17190: \$? = $ac_status" >&5
+  echo "$as_me:17581: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -17195,7 +17586,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17198 "configure"
+#line 17589 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -17209,16 +17600,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17212: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17603: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17215: \$? = $ac_status" >&5
+  echo "$as_me:17606: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17221: \$? = $ac_status" >&5
+  echo "$as_me:17612: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -17231,7 +17622,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:17234: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:17625: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -17249,7 +17640,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 17252 "configure"
+#line 17643 "configure"
 #include "confdefs.h"
 
 int
@@ -17261,19 +17652,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17264: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17655: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17267: \$? = $ac_status" >&5
+  echo "$as_me:17658: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17270: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17661: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17273: \$? = $ac_status" >&5
+  echo "$as_me:17664: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 17276 "configure"
+#line 17667 "configure"
 #include "confdefs.h"
 
 int
@@ -17285,16 +17676,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17288: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17679: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17291: \$? = $ac_status" >&5
+  echo "$as_me:17682: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17294: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17685: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17297: \$? = $ac_status" >&5
+  echo "$as_me:17688: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -17305,7 +17696,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	test -n "$verbose" && echo "	using functions in predefined $cf_cv_termlib LIBS" 1>&6
 
-echo "${as_me-configure}:17308: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me-configure}:17699: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -17320,10 +17711,10 @@ if test "$cf_cv_termlib" = none; then
 	LIBS="-l$cf_lib $cf_save_LIBS"
 	for cf_func in tigetstr tgetstr
 	do
-		echo "$as_me:17323: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:17714: checking for $cf_func in -l$cf_lib" >&5
 echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17326 "configure"
+#line 17717 "configure"
 #include "confdefs.h"
 
 int
@@ -17335,16 +17726,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17338: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17729: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17341: \$? = $ac_status" >&5
+  echo "$as_me:17732: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17735: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17347: \$? = $ac_status" >&5
+  echo "$as_me:17738: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -17353,7 +17744,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:17356: result: $cf_result" >&5
+		echo "$as_me:17747: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -17370,7 +17761,7 @@ echo "${ECHO_T}$cf_result" >&6
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:17373: checking for initscr in -lcurses" >&5
+	echo "$as_me:17764: checking for initscr in -lcurses" >&5
 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_curses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17378,7 +17769,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17381 "configure"
+#line 17772 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17397,16 +17788,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17400: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17791: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17403: \$? = $ac_status" >&5
+  echo "$as_me:17794: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17797: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17409: \$? = $ac_status" >&5
+  echo "$as_me:17800: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -17417,13 +17808,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17420: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:17811: result: $ac_cv_lib_curses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
 if test $ac_cv_lib_curses_initscr = yes; then
   LIBS="$LIBS -lcurses" cf_cv_termlib=termcap
 fi
 
-	echo "$as_me:17426: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:17817: checking for tgoto in -ltermcap" >&5
 echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6
 if test "${ac_cv_lib_termcap_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17431,7 +17822,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17434 "configure"
+#line 17825 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17450,16 +17841,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17453: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17844: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17456: \$? = $ac_status" >&5
+  echo "$as_me:17847: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17459: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17850: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17462: \$? = $ac_status" >&5
+  echo "$as_me:17853: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -17470,7 +17861,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17473: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:17864: result: $ac_cv_lib_termcap_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
 if test $ac_cv_lib_termcap_tgoto = yes; then
   LIBS="$LIBS -ltermcap" cf_cv_termlib=termcap
@@ -17481,20 +17872,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:17484: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:17875: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
 fi
 
 cf_slang_LIBS2="$LIBS"
-echo "$as_me:17491: checking for acos" >&5
+echo "$as_me:17882: checking for acos" >&5
 echo $ECHO_N "checking for acos... $ECHO_C" >&6
 if test "${ac_cv_func_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17497 "configure"
+#line 17888 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -17525,16 +17916,16 @@ f = acos;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17528: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17919: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17531: \$? = $ac_status" >&5
+  echo "$as_me:17922: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17537: \$? = $ac_status" >&5
+  echo "$as_me:17928: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -17544,13 +17935,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17547: result: $ac_cv_func_acos" >&5
+echo "$as_me:17938: result: $ac_cv_func_acos" >&5
 echo "${ECHO_T}$ac_cv_func_acos" >&6
 if test $ac_cv_func_acos = yes; then
   :
 else
 
-echo "$as_me:17553: checking for acos in -lm" >&5
+echo "$as_me:17944: checking for acos in -lm" >&5
 echo $ECHO_N "checking for acos in -lm... $ECHO_C" >&6
 if test "${ac_cv_lib_m_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17558,7 +17949,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17561 "configure"
+#line 17952 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17577,16 +17968,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17580: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17971: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17583: \$? = $ac_status" >&5
+  echo "$as_me:17974: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17589: \$? = $ac_status" >&5
+  echo "$as_me:17980: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -17597,7 +17988,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17600: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:17991: result: $ac_cv_lib_m_acos" >&5
 echo "${ECHO_T}$ac_cv_lib_m_acos" >&6
 if test $ac_cv_lib_m_acos = yes; then
 
@@ -17623,13 +18014,13 @@ os2*)
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:17626: checking for v_init" >&5
+	echo "$as_me:18017: checking for v_init" >&5
 echo $ECHO_N "checking for v_init... $ECHO_C" >&6
 if test "${ac_cv_func_v_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17632 "configure"
+#line 18023 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -17660,16 +18051,16 @@ f = v_init;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17663: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18054: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17666: \$? = $ac_status" >&5
+  echo "$as_me:18057: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17672: \$? = $ac_status" >&5
+  echo "$as_me:18063: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -17679,18 +18070,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17682: result: $ac_cv_func_v_init" >&5
+echo "$as_me:18073: result: $ac_cv_func_v_init" >&5
 echo "${ECHO_T}$ac_cv_func_v_init" >&6
 if test $ac_cv_func_v_init = yes; then
   eval 'cf_cv_have_lib_'video'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:17689: checking for v_init in -lvideo" >&5
+		echo "$as_me:18080: checking for v_init in -lvideo" >&5
 echo $ECHO_N "checking for v_init in -lvideo... $ECHO_C" >&6
 		LIBS="-lvideo $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17693 "configure"
+#line 18084 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -17702,25 +18093,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18096: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17708: \$? = $ac_status" >&5
+  echo "$as_me:18099: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17714: \$? = $ac_status" >&5
+  echo "$as_me:18105: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17716: result: yes" >&5
+  echo "$as_me:18107: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'video'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:17723: result: no" >&5
+echo "$as_me:18114: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -17781,11 +18172,11 @@ test -d "$HOME" && \
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:17784: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:18175: checking for -lvideo in $cf_libdir" >&5
 echo $ECHO_N "checking for -lvideo in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lvideo $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17788 "configure"
+#line 18179 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -17797,25 +18188,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17800: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18191: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17803: \$? = $ac_status" >&5
+  echo "$as_me:18194: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18197: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17809: \$? = $ac_status" >&5
+  echo "$as_me:18200: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17811: result: yes" >&5
+  echo "$as_me:18202: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'video'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:17818: result: no" >&5
+echo "$as_me:18209: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -17830,7 +18221,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:17833: error: Cannot link video library" >&5
+	{ { echo "$as_me:18224: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17840,13 +18231,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:17843: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:18234: checking for SLtt_get_screen_size" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size... $ECHO_C" >&6
 if test "${ac_cv_func_SLtt_get_screen_size+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17849 "configure"
+#line 18240 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -17877,16 +18268,16 @@ f = SLtt_get_screen_size;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17880: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18271: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17883: \$? = $ac_status" >&5
+  echo "$as_me:18274: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17889: \$? = $ac_status" >&5
+  echo "$as_me:18280: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -17896,18 +18287,18 @@ ac_cv_func_SLtt_get_screen_size=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17899: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:18290: result: $ac_cv_func_SLtt_get_screen_size" >&5
 echo "${ECHO_T}$ac_cv_func_SLtt_get_screen_size" >&6
 if test $ac_cv_func_SLtt_get_screen_size = yes; then
   eval 'cf_cv_have_lib_'slang'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:17906: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:18297: checking for SLtt_get_screen_size in -lslang" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size in -lslang... $ECHO_C" >&6
 		LIBS="-lslang $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17910 "configure"
+#line 18301 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -17919,25 +18310,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17922: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18313: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17925: \$? = $ac_status" >&5
+  echo "$as_me:18316: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17931: \$? = $ac_status" >&5
+  echo "$as_me:18322: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17933: result: yes" >&5
+  echo "$as_me:18324: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'slang'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:17940: result: no" >&5
+echo "$as_me:18331: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -17998,11 +18389,11 @@ test -d "$HOME" && \
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:18001: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:18392: checking for -lslang in $cf_libdir" >&5
 echo $ECHO_N "checking for -lslang in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lslang $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 18005 "configure"
+#line 18396 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -18014,25 +18405,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18017: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18408: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18020: \$? = $ac_status" >&5
+  echo "$as_me:18411: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18026: \$? = $ac_status" >&5
+  echo "$as_me:18417: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18028: result: yes" >&5
+  echo "$as_me:18419: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'slang'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:18035: result: no" >&5
+echo "$as_me:18426: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -18047,13 +18438,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:18050: error: Cannot link slang library" >&5
+	{ { echo "$as_me:18441: error: Cannot link slang library" >&5
 echo "$as_me: error: Cannot link slang library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 cf_slang_LIBS3="$LIBS"
-echo "$as_me:18056: checking if we can link slang without termcap" >&5
+echo "$as_me:18447: checking if we can link slang without termcap" >&5
 echo $ECHO_N "checking if we can link slang without termcap... $ECHO_C" >&6
 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
 	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'`
@@ -18062,7 +18453,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 18065 "configure"
+#line 18456 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -18074,16 +18465,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18077: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18468: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18080: \$? = $ac_status" >&5
+  echo "$as_me:18471: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18474: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18086: \$? = $ac_status" >&5
+  echo "$as_me:18477: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -18092,18 +18483,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:18095: result: $cf_result" >&5
+echo "$as_me:18486: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
-echo "$as_me:18099: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:18490: checking if we must tell slang this is UNIX" >&5
 echo $ECHO_N "checking if we must tell slang this is UNIX... $ECHO_C" >&6
 if test "${cf_cv_slang_unix+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 18106 "configure"
+#line 18497 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -18122,16 +18513,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18125: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18516: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18128: \$? = $ac_status" >&5
+  echo "$as_me:18519: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18522: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18134: \$? = $ac_status" >&5
+  echo "$as_me:18525: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -18142,7 +18533,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:18145: result: $cf_cv_slang_unix" >&5
+echo "$as_me:18536: result: $cf_cv_slang_unix" >&5
 echo "${ECHO_T}$cf_cv_slang_unix" >&6
 test $cf_cv_slang_unix = yes && cat >>confdefs.h <<\EOF
 #define REAL_UNIX_SYSTEM 1
@@ -18152,7 +18543,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:18155: checking if you want the wide-curses features" >&5
+echo "$as_me:18546: checking if you want the wide-curses features" >&5
 echo $ECHO_N "checking if you want the wide-curses features... $ECHO_C" >&6
 
 # Check whether --enable-widec or --disable-widec was given.
@@ -18169,10 +18560,10 @@ else
   use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:18172: result: $use_wide_curses" >&5
+echo "$as_me:18563: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:18175: checking if color-style code should be used" >&5
+echo "$as_me:18566: checking if color-style code should be used" >&5
 echo $ECHO_N "checking if color-style code should be used... $ECHO_C" >&6
 
 # Check whether --enable-color-style or --disable-color-style was given.
@@ -18192,7 +18583,7 @@ fi;
 
 case $use_color_style in
 no)
-	echo "$as_me:18195: result: no" >&5
+	echo "$as_me:18586: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -18201,10 +18592,10 @@ echo "${ECHO_T}no" >&6
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:18204: result: yes" >&5
+	echo "$as_me:18595: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:18207: checking for location of style-sheet file" >&5
+	echo "$as_me:18598: checking for location of style-sheet file" >&5
 echo $ECHO_N "checking for location of style-sheet file... $ECHO_C" >&6
 
 # Check whether --with-lss-file or --without-lss-file was given.
@@ -18240,7 +18631,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:18243: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:18634: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -18249,7 +18640,7 @@ esac
 fi
 LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:18252: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:18643: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -18261,7 +18652,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:18264: checking for the default configuration-file" >&5
+echo "$as_me:18655: checking for the default configuration-file" >&5
 echo $ECHO_N "checking for the default configuration-file... $ECHO_C" >&6
 
 # Check whether --with-cfg-file or --without-cfg-file was given.
@@ -18297,7 +18688,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:18300: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:18691: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -18306,7 +18697,7 @@ esac
 fi
 LYNX_CFG_FILE="$withval"
 
-echo "$as_me:18309: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:18700: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -18314,7 +18705,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:18317: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:18708: checking if htmlized lynx.cfg should be built" >&5
 echo $ECHO_N "checking if htmlized lynx.cfg should be built... $ECHO_C" >&6
 
 # Check whether --enable-htmlized-cfg or --disable-htmlized-cfg was given.
@@ -18331,7 +18722,7 @@ else
   use_htmlized_cfg=no
 
 fi;
-echo "$as_me:18334: result: $use_htmlized_cfg" >&5
+echo "$as_me:18725: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -18339,7 +18730,7 @@ if test $use_htmlized_cfg = no ; then
 	LYNXCFG_MAKE='#'
 fi
 
-echo "$as_me:18342: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:18733: checking if local doc directory should be linked to help page" >&5
 echo $ECHO_N "checking if local doc directory should be linked to help page... $ECHO_C" >&6
 
 # Check whether --enable-local-docs or --disable-local-docs was given.
@@ -18356,7 +18747,7 @@ else
   use_local_docs=no
 
 fi;
-echo "$as_me:18359: result: $use_local_docs" >&5
+echo "$as_me:18750: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -18364,7 +18755,7 @@ if test $use_local_docs = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:18367: checking for MIME library directory" >&5
+echo "$as_me:18758: checking for MIME library directory" >&5
 echo $ECHO_N "checking for MIME library directory... $ECHO_C" >&6
 
 # Check whether --with-mime-libdir or --without-mime-libdir was given.
@@ -18400,7 +18791,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:18403: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:18794: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -18409,14 +18800,14 @@ esac
 fi
 MIME_LIBDIR="$withval"
 
-echo "$as_me:18412: result: $MIME_LIBDIR" >&5
+echo "$as_me:18803: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:18419: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:18810: checking if locale-charset selection logic should be used" >&5
 echo $ECHO_N "checking if locale-charset selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-locale-charset or --disable-locale-charset was given.
@@ -18433,7 +18824,7 @@ else
   use_locale_charset=yes
 
 fi;
-echo "$as_me:18436: result: $use_locale_charset" >&5
+echo "$as_me:18827: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test $use_locale_charset != no && cat >>confdefs.h <<\EOF
 #define USE_LOCALE_CHARSET 1
@@ -18441,7 +18832,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:18444: checking if you want only a few charsets" >&5
+echo "$as_me:18835: checking if you want only a few charsets" >&5
 echo $ECHO_N "checking if you want only a few charsets... $ECHO_C" >&6
 
 # Check whether --with-charsets or --without-charsets was given.
@@ -18453,7 +18844,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:18456: result: yes" >&5
+	echo "$as_me:18847: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	cat >>confdefs.h <<\EOF
 #define ALL_CHARSETS 0
@@ -18466,7 +18857,7 @@ EOF
 	if test "$cf_charsets" = "minimal" ; then
 		test -n "$verbose" && echo "	using minimal list of charsets: $cf_min_charsets" 1>&6
 
-echo "${as_me-configure}:18469: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me-configure}:18860: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
 
 	fi
 	cf_charsets=`echo $cf_charsets | sed -e "s/minimal/$cf_min_charsets/g" -e 's/,/ /g'`
@@ -18493,28 +18884,28 @@ echo "${as_me-configure}:18469: testing using minimal list of charsets: $cf_min_
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me-configure}:18496: testing found $cf_charset ..." 1>&5
+echo "${as_me-configure}:18887: testing found $cf_charset ..." 1>&5
 
 			CHARSET_DEFS="-DNO_CHARSET_${cf_def_charset}=0 $CHARSET_DEFS"
 		else
 			test -n "$verbose" && echo "	not found $cf_charset" 1>&6
 
-echo "${as_me-configure}:18502: testing not found $cf_charset ..." 1>&5
+echo "${as_me-configure}:18893: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:18507: result: no" >&5
+	echo "$as_me:18898: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:18511: checking for ANSI C header files" >&5
+echo "$as_me:18902: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18517 "configure"
+#line 18908 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -18522,13 +18913,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:18525: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18916: \"$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:18531: \$? = $ac_status" >&5
+  echo "$as_me:18922: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18550,7 +18941,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 18553 "configure"
+#line 18944 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -18568,7 +18959,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 18571 "configure"
+#line 18962 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -18589,7 +18980,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18592 "configure"
+#line 18983 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -18615,15 +19006,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18618: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19009: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18621: \$? = $ac_status" >&5
+  echo "$as_me:19012: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:18623: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19014: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18626: \$? = $ac_status" >&5
+  echo "$as_me:19017: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18636,7 +19027,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:18639: result: $ac_cv_header_stdc" >&5
+echo "$as_me:19030: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -18646,13 +19037,13 @@ EOF
 
 fi
 
-echo "$as_me:18649: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19040: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18655 "configure"
+#line 19046 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -18668,16 +19059,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18671: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19062: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18674: \$? = $ac_status" >&5
+  echo "$as_me:19065: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18677: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18680: \$? = $ac_status" >&5
+  echo "$as_me:19071: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -18687,7 +19078,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:18690: result: $ac_cv_header_time" >&5
+echo "$as_me:19081: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -18700,13 +19091,13 @@ fi
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:18703: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:19094: checking for $ac_hdr that defines DIR" >&5
 echo $ECHO_N "checking for $ac_hdr that defines DIR... $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 18709 "configure"
+#line 19100 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -18721,16 +19112,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18724: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19115: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18727: \$? = $ac_status" >&5
+  echo "$as_me:19118: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18730: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18733: \$? = $ac_status" >&5
+  echo "$as_me:19124: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -18740,7 +19131,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:18743: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:19134: 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
@@ -18753,7 +19144,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:18756: checking for opendir in -ldir" >&5
+  echo "$as_me:19147: checking for opendir in -ldir" >&5
 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18761,7 +19152,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18764 "configure"
+#line 19155 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18780,16 +19171,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18783: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19174: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18786: \$? = $ac_status" >&5
+  echo "$as_me:19177: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19180: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18792: \$? = $ac_status" >&5
+  echo "$as_me:19183: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -18800,14 +19191,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18803: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:19194: result: $ac_cv_lib_dir_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else
-  echo "$as_me:18810: checking for opendir in -lx" >&5
+  echo "$as_me:19201: checking for opendir in -lx" >&5
 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18815,7 +19206,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18818 "configure"
+#line 19209 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18834,16 +19225,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18837: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19228: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18840: \$? = $ac_status" >&5
+  echo "$as_me:19231: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18846: \$? = $ac_status" >&5
+  echo "$as_me:19237: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -18854,7 +19245,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18857: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:19248: result: $ac_cv_lib_x_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"
@@ -18882,23 +19273,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18885: checking for $ac_header" >&5
+echo "$as_me:19276: 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 18891 "configure"
+#line 19282 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18895: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19286: \"$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:18901: \$? = $ac_status" >&5
+  echo "$as_me:19292: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18917,7 +19308,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:18920: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:19311: 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
@@ -18927,14 +19318,14 @@ EOF
 fi
 done
 
-echo "$as_me:18930: checking termio.h and termios.h" >&5
+echo "$as_me:19321: checking termio.h and termios.h" >&5
 echo $ECHO_N "checking termio.h and termios.h... $ECHO_C" >&6
 if test "${cf_cv_termio_and_termios+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 18937 "configure"
+#line 19328 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -18952,16 +19343,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18955: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19346: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18958: \$? = $ac_status" >&5
+  echo "$as_me:19349: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19352: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18964: \$? = $ac_status" >&5
+  echo "$as_me:19355: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -18972,20 +19363,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:18975: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:19366: result: $cf_cv_termio_and_termios" >&5
 echo "${ECHO_T}$cf_cv_termio_and_termios" >&6
 test $cf_cv_termio_and_termios = no && cat >>confdefs.h <<\EOF
 #define TERMIO_AND_TERMIOS 1
 EOF
 
-echo "$as_me:18981: checking for sigaction and structs" >&5
+echo "$as_me:19372: checking for sigaction and structs" >&5
 echo $ECHO_N "checking for sigaction and structs... $ECHO_C" >&6
 if test "${cf_cv_func_sigaction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 18988 "configure"
+#line 19379 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19005,16 +19396,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19008: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19399: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19011: \$? = $ac_status" >&5
+  echo "$as_me:19402: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19017: \$? = $ac_status" >&5
+  echo "$as_me:19408: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -19025,7 +19416,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:19028: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:19419: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_SIGACTION 1
@@ -19034,23 +19425,23 @@ EOF
 for ac_header in sys/wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:19037: checking for $ac_header" >&5
+echo "$as_me:19428: 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 19043 "configure"
+#line 19434 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:19047: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19438: \"$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:19053: \$? = $ac_status" >&5
+  echo "$as_me:19444: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19069,7 +19460,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:19072: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:19463: 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
@@ -19090,23 +19481,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:19093: checking for $ac_header" >&5
+echo "$as_me:19484: 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 19099 "configure"
+#line 19490 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:19103: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19494: \"$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:19109: \$? = $ac_status" >&5
+  echo "$as_me:19500: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19125,7 +19516,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:19128: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:19519: 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
@@ -19138,23 +19529,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:19141: checking for $ac_header" >&5
+echo "$as_me:19532: 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 19147 "configure"
+#line 19538 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:19151: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19542: \"$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:19157: \$? = $ac_status" >&5
+  echo "$as_me:19548: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19173,7 +19564,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:19176: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:19567: 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
@@ -19195,14 +19586,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:19198: checking for union wait" >&5
+echo "$as_me:19589: checking for union wait" >&5
 echo $ECHO_N "checking for union wait... $ECHO_C" >&6
 if test "${cf_cv_type_unionwait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19205 "configure"
+#line 19596 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -19218,16 +19609,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19221: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19612: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19224: \$? = $ac_status" >&5
+  echo "$as_me:19615: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19618: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19230: \$? = $ac_status" >&5
+  echo "$as_me:19621: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -19237,7 +19628,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19240 "configure"
+#line 19631 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -19257,16 +19648,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19260: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19651: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19263: \$? = $ac_status" >&5
+  echo "$as_me:19654: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19657: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19269: \$? = $ac_status" >&5
+  echo "$as_me:19660: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -19281,7 +19672,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:19284: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:19675: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test $cf_cv_type_unionwait = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_UNIONWAIT 1
@@ -19289,14 +19680,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:19292: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:19683: checking if union wait can be used as wait-arg" >&5
 echo $ECHO_N "checking if union wait can be used as wait-arg... $ECHO_C" >&6
 	if test "${cf_cv_arg_union_wait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 19299 "configure"
+#line 19690 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -19308,16 +19699,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19311: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19702: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19314: \$? = $ac_status" >&5
+  echo "$as_me:19705: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19320: \$? = $ac_status" >&5
+  echo "$as_me:19711: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -19329,20 +19720,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:19332: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:19723: result: $cf_cv_arg_union_wait" >&5
 echo "${ECHO_T}$cf_cv_arg_union_wait" >&6
 	test $cf_cv_arg_union_wait = yes && cat >>confdefs.h <<\EOF
 #define WAIT_USES_UNION 1
 EOF
 
-	echo "$as_me:19338: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:19729: checking if union wait can be used as waitpid-arg" >&5
 echo $ECHO_N "checking if union wait can be used as waitpid-arg... $ECHO_C" >&6
 	if test "${cf_cv_arg_union_waitpid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 19345 "configure"
+#line 19736 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -19354,16 +19745,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19357: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19748: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19360: \$? = $ac_status" >&5
+  echo "$as_me:19751: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19754: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19366: \$? = $ac_status" >&5
+  echo "$as_me:19757: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -19375,7 +19766,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:19378: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:19769: result: $cf_cv_arg_union_waitpid" >&5
 echo "${ECHO_T}$cf_cv_arg_union_waitpid" >&6
 	test $cf_cv_arg_union_waitpid = yes && cat >>confdefs.h <<\EOF
 #define WAITPID_USES_UNION 1
@@ -19386,23 +19777,23 @@ fi
 for ac_header in stdarg.h varargs.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:19389: checking for $ac_header" >&5
+echo "$as_me:19780: 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 19395 "configure"
+#line 19786 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:19399: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19790: \"$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:19405: \$? = $ac_status" >&5
+  echo "$as_me:19796: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19421,7 +19812,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:19424: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:19815: 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
@@ -19431,14 +19822,14 @@ EOF
 fi
 done
 
-echo "$as_me:19434: checking for standard varargs" >&5
+echo "$as_me:19825: checking for standard varargs" >&5
 echo $ECHO_N "checking for standard varargs... $ECHO_C" >&6
 if test "${cf_cv_ansi_varargs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19441 "configure"
+#line 19832 "configure"
 #include "confdefs.h"
 
 #if HAVE_STDARG_H
@@ -19458,16 +19849,16 @@ return 0;} int foo(char *fmt,...){va_list args;va_start(args,fmt);va_end(args)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19461: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19852: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19464: \$? = $ac_status" >&5
+  echo "$as_me:19855: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19470: \$? = $ac_status" >&5
+  echo "$as_me:19861: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_varargs=yes
 else
@@ -19479,19 +19870,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:19482: result: $cf_cv_ansi_varargs" >&5
+echo "$as_me:19873: result: $cf_cv_ansi_varargs" >&5
 echo "${ECHO_T}$cf_cv_ansi_varargs" >&6
 test $cf_cv_ansi_varargs = yes && cat >>confdefs.h <<\EOF
 #define ANSI_VARARGS 1
 EOF
 
-echo "$as_me:19488: checking for uid_t in sys/types.h" >&5
+echo "$as_me:19879: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19494 "configure"
+#line 19885 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -19505,7 +19896,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:19508: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:19899: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -19519,7 +19910,7 @@ EOF
 
 fi
 
-echo "$as_me:19522: checking type of array argument to getgroups" >&5
+echo "$as_me:19913: checking type of array argument to getgroups" >&5
 echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6
 if test "${ac_cv_type_getgroups+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19528,7 +19919,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19531 "configure"
+#line 19922 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -19554,15 +19945,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:19557: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19948: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19560: \$? = $ac_status" >&5
+  echo "$as_me:19951: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:19562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19953: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19565: \$? = $ac_status" >&5
+  echo "$as_me:19956: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -19575,7 +19966,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 if test $ac_cv_type_getgroups = cross; then
         cat >conftest.$ac_ext <<_ACEOF
-#line 19578 "configure"
+#line 19969 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -19590,20 +19981,20 @@ rm -f conftest*
 
 fi
 fi
-echo "$as_me:19593: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:19984: result: $ac_cv_type_getgroups" >&5
 echo "${ECHO_T}$ac_cv_type_getgroups" >&6
 
 cat >>confdefs.h <<EOF
 #define GETGROUPS_T $ac_cv_type_getgroups
 EOF
 
-echo "$as_me:19600: checking for pid_t" >&5
+echo "$as_me:19991: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19606 "configure"
+#line 19997 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -19618,16 +20009,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19621: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20012: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19624: \$? = $ac_status" >&5
+  echo "$as_me:20015: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19630: \$? = $ac_status" >&5
+  echo "$as_me:20021: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -19637,7 +20028,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19640: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:20031: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
   :
@@ -19649,13 +20040,13 @@ EOF
 
 fi
 
-echo "$as_me:19652: checking for uid_t in sys/types.h" >&5
+echo "$as_me:20043: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19658 "configure"
+#line 20049 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -19669,7 +20060,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:19672: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:20063: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -19683,13 +20074,13 @@ EOF
 
 fi
 
-echo "$as_me:19686: checking for mode_t" >&5
+echo "$as_me:20077: checking for mode_t" >&5
 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
 if test "${ac_cv_type_mode_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19692 "configure"
+#line 20083 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -19704,16 +20095,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19707: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20098: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19710: \$? = $ac_status" >&5
+  echo "$as_me:20101: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19716: \$? = $ac_status" >&5
+  echo "$as_me:20107: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -19723,7 +20114,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19726: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:20117: result: $ac_cv_type_mode_t" >&5
 echo "${ECHO_T}$ac_cv_type_mode_t" >&6
 if test $ac_cv_type_mode_t = yes; then
   :
@@ -19735,13 +20126,13 @@ EOF
 
 fi
 
-	echo "$as_me:19738: checking for socklen_t" >&5
+	echo "$as_me:20129: checking for socklen_t" >&5
 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
 if test "${ac_cv_type_socklen_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19744 "configure"
+#line 20135 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 
@@ -19757,16 +20148,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19760: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20151: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19763: \$? = $ac_status" >&5
+  echo "$as_me:20154: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20157: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19769: \$? = $ac_status" >&5
+  echo "$as_me:20160: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -19776,7 +20167,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19779: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:20170: result: $ac_cv_type_socklen_t" >&5
 echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
 if test $ac_cv_type_socklen_t = yes; then
   ac_cv_type_socklen_t=yes
@@ -19793,13 +20184,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:19796: checking for working alloca.h" >&5
+echo "$as_me:20187: 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 19802 "configure"
+#line 20193 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -19811,16 +20202,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19814: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20205: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19817: \$? = $ac_status" >&5
+  echo "$as_me:20208: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19823: \$? = $ac_status" >&5
+  echo "$as_me:20214: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -19830,7 +20221,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19833: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:20224: 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
 
@@ -19840,13 +20231,13 @@ EOF
 
 fi
 
-echo "$as_me:19843: checking for alloca" >&5
+echo "$as_me:20234: 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 19849 "configure"
+#line 20240 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -19878,16 +20269,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19881: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20272: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19884: \$? = $ac_status" >&5
+  echo "$as_me:20275: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20278: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19890: \$? = $ac_status" >&5
+  echo "$as_me:20281: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -19897,7 +20288,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19900: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:20291: 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
@@ -19918,13 +20309,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:19921: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:20312: 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 19927 "configure"
+#line 20318 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -19942,18 +20333,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:19945: result: $ac_cv_os_cray" >&5
+echo "$as_me:20336: 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:19950: checking for $ac_func" >&5
+echo "$as_me:20341: 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 19956 "configure"
+#line 20347 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -19984,16 +20375,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19987: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20378: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19990: \$? = $ac_status" >&5
+  echo "$as_me:20381: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19996: \$? = $ac_status" >&5
+  echo "$as_me:20387: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20003,7 +20394,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20006: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:20397: 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
 
@@ -20017,7 +20408,7 @@ fi
   done
 fi
 
-echo "$as_me:20020: checking stack direction for C alloca" >&5
+echo "$as_me:20411: 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
@@ -20026,7 +20417,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20029 "configure"
+#line 20420 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -20049,15 +20440,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20052: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20443: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20055: \$? = $ac_status" >&5
+  echo "$as_me:20446: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20060: \$? = $ac_status" >&5
+  echo "$as_me:20451: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -20069,7 +20460,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:20072: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:20463: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -20081,23 +20472,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:20084: checking for $ac_header" >&5
+echo "$as_me:20475: 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 20090 "configure"
+#line 20481 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20094: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20485: \"$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:20100: \$? = $ac_status" >&5
+  echo "$as_me:20491: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20116,7 +20507,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20119: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:20510: 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
@@ -20129,13 +20520,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:20132: checking for $ac_func" >&5
+echo "$as_me:20523: 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 20138 "configure"
+#line 20529 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -20166,16 +20557,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20169: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20560: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20172: \$? = $ac_status" >&5
+  echo "$as_me:20563: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20178: \$? = $ac_status" >&5
+  echo "$as_me:20569: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20185,7 +20576,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20188: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:20579: 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
@@ -20197,7 +20588,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:20200: checking for working fork" >&5
+  echo "$as_me:20591: 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
@@ -20220,15 +20611,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20223: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20614: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20226: \$? = $ac_status" >&5
+  echo "$as_me:20617: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20231: \$? = $ac_status" >&5
+  echo "$as_me:20622: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -20240,7 +20631,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:20243: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:20634: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -20254,12 +20645,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:20257: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:20648: 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:20262: checking for working vfork" >&5
+  echo "$as_me:20653: 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
@@ -20268,7 +20659,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20271 "configure"
+#line 20662 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -20365,15 +20756,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20368: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20759: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20371: \$? = $ac_status" >&5
+  echo "$as_me:20762: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20373: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20376: \$? = $ac_status" >&5
+  echo "$as_me:20767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -20385,13 +20776,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:20388: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:20779: 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:20394: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:20785: 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
 
@@ -20416,14 +20807,14 @@ EOF
 
 fi
 
-echo "$as_me:20419: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:20810: 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 20426 "configure"
+#line 20817 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20440,16 +20831,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20443: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20834: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20446: \$? = $ac_status" >&5
+  echo "$as_me:20837: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20452: \$? = $ac_status" >&5
+  echo "$as_me:20843: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -20457,7 +20848,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 20460 "configure"
+#line 20851 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20479,16 +20870,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20482: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20873: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20485: \$? = $ac_status" >&5
+  echo "$as_me:20876: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20879: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20491: \$? = $ac_status" >&5
+  echo "$as_me:20882: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -20501,20 +20892,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:20504: result: $cf_cv_fionbio" >&5
+echo "$as_me:20895: 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:20510: checking for broken/missing definition of remove" >&5
+echo "$as_me:20901: 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 20517 "configure"
+#line 20908 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20526,23 +20917,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20529: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20920: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20532: \$? = $ac_status" >&5
+  echo "$as_me:20923: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20538: \$? = $ac_status" >&5
+  echo "$as_me:20929: \$? = $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 20545 "configure"
+#line 20936 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -20555,16 +20946,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20558: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20949: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20561: \$? = $ac_status" >&5
+  echo "$as_me:20952: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20955: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20567: \$? = $ac_status" >&5
+  echo "$as_me:20958: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -20579,20 +20970,20 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:20582: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:20973: 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:20588: checking for lstat" >&5
+echo "$as_me:20979: 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 20595 "configure"
+#line 20986 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20606,16 +20997,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20609: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21000: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20612: \$? = $ac_status" >&5
+  echo "$as_me:21003: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21006: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20618: \$? = $ac_status" >&5
+  echo "$as_me:21009: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -20627,7 +21018,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:20630: result: $ac_cv_func_lstat " >&5
+echo "$as_me:21021: 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
@@ -20661,13 +21052,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:20664: checking for $ac_func" >&5
+echo "$as_me:21055: 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 20670 "configure"
+#line 21061 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -20698,16 +21089,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20701: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21092: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20704: \$? = $ac_status" >&5
+  echo "$as_me:21095: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20707: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20710: \$? = $ac_status" >&5
+  echo "$as_me:21101: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20717,7 +21108,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20720: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:21111: 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
@@ -20733,13 +21124,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:20736: checking for $ac_func" >&5
+echo "$as_me:21127: 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 20742 "configure"
+#line 21133 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -20770,16 +21161,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20773: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21164: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20776: \$? = $ac_status" >&5
+  echo "$as_me:21167: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20779: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20782: \$? = $ac_status" >&5
+  echo "$as_me:21173: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20789,7 +21180,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20792: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:21183: 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
@@ -20801,7 +21192,7 @@ else
 fi
 done
 
-echo "$as_me:20804: checking for random-integer functions" >&5
+echo "$as_me:21195: 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
@@ -20821,7 +21212,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 20824 "configure"
+#line 21215 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -20840,16 +21231,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:20843: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21234: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20846: \$? = $ac_status" >&5
+  echo "$as_me:21237: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21240: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20852: \$? = $ac_status" >&5
+  echo "$as_me:21243: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -20861,10 +21252,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20864: result: $cf_cv_srand_func" >&5
+echo "$as_me:21255: 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:20867: checking for range of random-integers" >&5
+	echo "$as_me:21258: 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
@@ -20885,7 +21276,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 20888 "configure"
+#line 21279 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -20904,16 +21295,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20907: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21298: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20910: \$? = $ac_status" >&5
+  echo "$as_me:21301: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20916: \$? = $ac_status" >&5
+  echo "$as_me:21307: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20924,7 +21315,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:20927: result: $cf_cv_rand_max" >&5
+echo "$as_me:21318: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
@@ -20955,13 +21346,13 @@ fi
 for ac_func in strstr
 do
 
-echo "$as_me:20958: checking for $ac_func declaration" >&5
+echo "$as_me:21349: 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 20964 "configure"
+#line 21355 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -20975,20 +21366,20 @@ extern	int	${ac_func}();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20978: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21369: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20981: \$? = $ac_status" >&5
+  echo "$as_me:21372: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20987: \$? = $ac_status" >&5
+  echo "$as_me:21378: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 20991 "configure"
+#line 21382 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -21002,16 +21393,16 @@ int	(*p)() = ${ac_func};
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21005: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21396: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21008: \$? = $ac_status" >&5
+  echo "$as_me:21399: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21014: \$? = $ac_status" >&5
+  echo "$as_me:21405: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -21032,11 +21423,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:21035: result: yes" >&5
+  echo "$as_me:21426: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:21039: result: no" >&5
+  echo "$as_me:21430: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -21051,13 +21442,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:21054: checking for $ac_func declaration" >&5
+echo "$as_me:21445: 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 21060 "configure"
+#line 21451 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21073,20 +21464,20 @@ extern	int	${ac_func}();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21076: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21467: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21079: \$? = $ac_status" >&5
+  echo "$as_me:21470: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21085: \$? = $ac_status" >&5
+  echo "$as_me:21476: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 21089 "configure"
+#line 21480 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21102,16 +21493,16 @@ int	(*p)() = ${ac_func};
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21105: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21496: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21108: \$? = $ac_status" >&5
+  echo "$as_me:21499: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21111: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21502: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21114: \$? = $ac_status" >&5
+  echo "$as_me:21505: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -21132,11 +21523,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:21135: result: yes" >&5
+  echo "$as_me:21526: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:21139: result: no" >&5
+  echo "$as_me:21530: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -21148,14 +21539,14 @@ EOF
 fi
 done
 
-echo "$as_me:21151: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:21542: 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 21158 "configure"
+#line 21549 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -21169,16 +21560,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21172: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21563: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21175: \$? = $ac_status" >&5
+  echo "$as_me:21566: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21178: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21569: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21181: \$? = $ac_status" >&5
+  echo "$as_me:21572: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -21189,7 +21580,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:21192: result: $cf_cv_bool_defs" >&5
+echo "$as_me:21583: 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
@@ -21202,14 +21593,14 @@ EOF
 
 fi
 
-echo "$as_me:21205: checking if external errno is declared" >&5
+echo "$as_me:21596: 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 21212 "configure"
+#line 21603 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -21227,16 +21618,16 @@ long x = (long) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21230: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21621: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21233: \$? = $ac_status" >&5
+  echo "$as_me:21624: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21239: \$? = $ac_status" >&5
+  echo "$as_me:21630: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21247,7 +21638,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:21250: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21641: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21262,14 +21653,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21265: checking if external errno exists" >&5
+echo "$as_me:21656: 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 21272 "configure"
+#line 21663 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21284,16 +21675,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21287: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21678: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21290: \$? = $ac_status" >&5
+  echo "$as_me:21681: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21296: \$? = $ac_status" >&5
+  echo "$as_me:21687: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21304,7 +21695,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:21307: result: $cf_cv_have_errno" >&5
+echo "$as_me:21698: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21317,7 +21708,7 @@ EOF
 
 fi
 
-echo "$as_me:21320: checking if we can set errno" >&5
+echo "$as_me:21711: 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
@@ -21325,7 +21716,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 21328 "configure"
+#line 21719 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -21337,16 +21728,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21340: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21731: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21343: \$? = $ac_status" >&5
+  echo "$as_me:21734: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21349: \$? = $ac_status" >&5
+  echo "$as_me:21740: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -21357,7 +21748,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21360 "configure"
+#line 21751 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -21368,15 +21759,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21371: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21762: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21374: \$? = $ac_status" >&5
+  echo "$as_me:21765: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21767: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21379: \$? = $ac_status" >&5
+  echo "$as_me:21770: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -21389,20 +21780,20 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:21392: result: $cf_cv_set_errno" >&5
+echo "$as_me:21783: 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:21398: checking for setlocale()" >&5
+echo "$as_me:21789: 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 21405 "configure"
+#line 21796 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -21414,16 +21805,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21420: \$? = $ac_status" >&5
+  echo "$as_me:21811: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21426: \$? = $ac_status" >&5
+  echo "$as_me:21817: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -21435,21 +21826,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:21438: result: $cf_cv_locale" >&5
+echo "$as_me:21829: 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:21445: checking if NGROUPS is defined" >&5
+echo "$as_me:21836: 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 21452 "configure"
+#line 21843 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -21468,23 +21859,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21471: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21862: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21474: \$? = $ac_status" >&5
+  echo "$as_me:21865: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21868: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21480: \$? = $ac_status" >&5
+  echo "$as_me:21871: \$? = $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 21487 "configure"
+#line 21878 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -21503,16 +21894,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21506: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21897: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21509: \$? = $ac_status" >&5
+  echo "$as_me:21900: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21903: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21515: \$? = $ac_status" >&5
+  echo "$as_me:21906: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -21524,7 +21915,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:21527: result: $cf_cv_ngroups" >&5
+echo "$as_me:21918: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -21541,14 +21932,14 @@ EOF
 
 fi
 
-echo "$as_me:21544: checking if external sys_nerr is declared" >&5
+echo "$as_me:21935: 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 21551 "configure"
+#line 21942 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -21566,16 +21957,16 @@ long x = (long) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21569: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21960: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21572: \$? = $ac_status" >&5
+  echo "$as_me:21963: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21966: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21578: \$? = $ac_status" >&5
+  echo "$as_me:21969: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -21586,7 +21977,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:21589: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:21980: 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
@@ -21601,14 +21992,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21604: checking if external sys_nerr exists" >&5
+echo "$as_me:21995: 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 21611 "configure"
+#line 22002 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -21623,16 +22014,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22017: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21629: \$? = $ac_status" >&5
+  echo "$as_me:22020: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21635: \$? = $ac_status" >&5
+  echo "$as_me:22026: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -21643,7 +22034,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:21646: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:22037: 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
@@ -21656,14 +22047,14 @@ EOF
 
 fi
 
-echo "$as_me:21659: checking if external sys_errlist is declared" >&5
+echo "$as_me:22050: 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 21666 "configure"
+#line 22057 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -21681,16 +22072,16 @@ long x = (long) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21684: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22075: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21687: \$? = $ac_status" >&5
+  echo "$as_me:22078: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21693: \$? = $ac_status" >&5
+  echo "$as_me:22084: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -21701,7 +22092,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:21704: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:22095: 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
@@ -21716,14 +22107,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21719: checking if external sys_errlist exists" >&5
+echo "$as_me:22110: 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 21726 "configure"
+#line 22117 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -21738,16 +22129,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21741: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22132: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21744: \$? = $ac_status" >&5
+  echo "$as_me:22135: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22138: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21750: \$? = $ac_status" >&5
+  echo "$as_me:22141: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -21758,7 +22149,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:21761: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:22152: 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
@@ -21774,23 +22165,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:21777: checking for $ac_header" >&5
+echo "$as_me:22168: 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 21783 "configure"
+#line 22174 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21787: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:22178: \"$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:21793: \$? = $ac_status" >&5
+  echo "$as_me:22184: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21809,7 +22200,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:21812: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:22203: 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
@@ -21819,14 +22210,14 @@ EOF
 fi
 done
 
-echo "$as_me:21822: checking for lastlog path" >&5
+echo "$as_me:22213: 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 21829 "configure"
+#line 22220 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21846,16 +22237,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21849: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22240: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21852: \$? = $ac_status" >&5
+  echo "$as_me:22243: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21858: \$? = $ac_status" >&5
+  echo "$as_me:22249: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -21870,13 +22261,13 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:21873: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:22264: 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:21879: checking for utmp implementation" >&5
+echo "$as_me:22270: 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
@@ -21893,7 +22284,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21896 "configure"
+#line 22287 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -21907,16 +22298,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21910: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22301: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21913: \$? = $ac_status" >&5
+  echo "$as_me:22304: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22307: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21919: \$? = $ac_status" >&5
+  echo "$as_me:22310: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -21925,7 +22316,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21928 "configure"
+#line 22319 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -21939,16 +22330,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21942: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22333: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21945: \$? = $ac_status" >&5
+  echo "$as_me:22336: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21951: \$? = $ac_status" >&5
+  echo "$as_me:22342: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -21963,7 +22354,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:21966: result: $cf_cv_have_utmp" >&5
+echo "$as_me:22357: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -21976,14 +22367,14 @@ EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:21979: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:22370: 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 21986 "configure"
+#line 22377 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21997,16 +22388,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22000: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22391: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22003: \$? = $ac_status" >&5
+  echo "$as_me:22394: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22006: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22397: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22009: \$? = $ac_status" >&5
+  echo "$as_me:22400: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -22018,7 +22409,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:22021: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:22412: 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
@@ -22027,7 +22418,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:22030: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:22421: 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
@@ -22044,7 +22435,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22047 "configure"
+#line 22438 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -22058,16 +22449,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22061: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22452: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22064: \$? = $ac_status" >&5
+  echo "$as_me:22455: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22458: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22070: \$? = $ac_status" >&5
+  echo "$as_me:22461: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -22079,12 +22470,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:22082: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:22473: 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:22087: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:22478: 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; }; }
 	;;
@@ -22098,7 +22489,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:22101: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:22492: 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
@@ -22111,7 +22502,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 22114 "configure"
+#line 22505 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22125,16 +22516,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22128: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22519: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22131: \$? = $ac_status" >&5
+  echo "$as_me:22522: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22137: \$? = $ac_status" >&5
+  echo "$as_me:22528: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -22147,7 +22538,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:22150: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:22541: 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
@@ -22162,14 +22553,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:22165: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:22556: 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 22172 "configure"
+#line 22563 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22183,23 +22574,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22186: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22577: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22189: \$? = $ac_status" >&5
+  echo "$as_me:22580: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22192: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22583: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22195: \$? = $ac_status" >&5
+  echo "$as_me:22586: \$? = $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 22202 "configure"
+#line 22593 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22213,16 +22604,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:22216: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22607: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22219: \$? = $ac_status" >&5
+  echo "$as_me:22610: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22613: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22225: \$? = $ac_status" >&5
+  echo "$as_me:22616: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -22236,7 +22627,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:22239: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:22630: 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
@@ -22253,14 +22644,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:22256: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:22647: 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 22263 "configure"
+#line 22654 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22274,16 +22665,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22277: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22668: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22280: \$? = $ac_status" >&5
+  echo "$as_me:22671: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22286: \$? = $ac_status" >&5
+  echo "$as_me:22677: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -22294,7 +22685,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:22297: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:22688: 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
@@ -22304,7 +22695,7 @@ EOF
 fi
 fi
 
-echo "$as_me:22307: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:22698: 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
@@ -22312,7 +22703,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22315 "configure"
+#line 22706 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22331,16 +22722,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22334: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22725: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22337: \$? = $ac_status" >&5
+  echo "$as_me:22728: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22343: \$? = $ac_status" >&5
+  echo "$as_me:22734: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -22351,7 +22742,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:22354: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:22745: 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
@@ -22359,14 +22750,14 @@ EOF
 
 fi
 
-echo "$as_me:22362: checking if external h_errno exists" >&5
+echo "$as_me:22753: 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 22369 "configure"
+#line 22760 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -22381,16 +22772,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22384: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22775: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22387: \$? = $ac_status" >&5
+  echo "$as_me:22778: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22781: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22393: \$? = $ac_status" >&5
+  echo "$as_me:22784: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -22401,7 +22792,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:22404: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:22795: 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
@@ -22414,7 +22805,7 @@ EOF
 
 fi
 
-echo "$as_me:22417: checking if bibp: URLs should be supported" >&5
+echo "$as_me:22808: 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.
@@ -22431,13 +22822,13 @@ else
   use_bibp_urls=yes
 
 fi;
-echo "$as_me:22434: result: $use_bibp_urls" >&5
+echo "$as_me:22825: 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:22440: checking if configuration info should be browsable" >&5
+echo "$as_me:22831: 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.
@@ -22454,13 +22845,13 @@ else
   use_config_info=yes
 
 fi;
-echo "$as_me:22457: result: $use_config_info" >&5
+echo "$as_me:22848: 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:22463: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:22854: 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.
@@ -22477,13 +22868,13 @@ else
   use_forms_options=yes
 
 fi;
-echo "$as_me:22480: result: $use_forms_options" >&5
+echo "$as_me:22871: 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:22486: checking if old-style options menu should be used" >&5
+echo "$as_me:22877: 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.
@@ -22500,13 +22891,13 @@ else
   use_menu_options=yes
 
 fi;
-echo "$as_me:22503: result: $use_menu_options" >&5
+echo "$as_me:22894: 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:22509: checking if experimental address-list page should be used" >&5
+echo "$as_me:22900: 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.
@@ -22523,13 +22914,13 @@ else
   use_addrlist_page=no
 
 fi;
-echo "$as_me:22526: result: $use_addrlist_page" >&5
+echo "$as_me:22917: 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:22532: checking if experimental charset-selection logic should be used" >&5
+echo "$as_me:22923: 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.
@@ -22546,13 +22937,13 @@ else
   use_charset_choice=no
 
 fi;
-echo "$as_me:22549: result: $use_charset_choice" >&5
+echo "$as_me:22940: 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:22555: checking if experimental CJK logic should be used" >&5
+echo "$as_me:22946: 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.
@@ -22569,13 +22960,13 @@ else
   use_cjk=no
 
 fi;
-echo "$as_me:22572: result: $use_cjk" >&5
+echo "$as_me:22963: 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:22578: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:22969: 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.
@@ -22592,7 +22983,7 @@ else
   use_ja_utf8=no
 
 fi;
-echo "$as_me:22595: result: $use_ja_utf8" >&5
+echo "$as_me:22986: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 	cat >>confdefs.h <<\EOF
@@ -22637,7 +23028,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22640 "configure"
+#line 23031 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22649,16 +23040,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22652: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23043: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22655: \$? = $ac_status" >&5
+  echo "$as_me:23046: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23049: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22661: \$? = $ac_status" >&5
+  echo "$as_me:23052: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22673,8 +23064,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:22676: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:23069: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -22714,7 +23107,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22717 "configure"
+#line 23110 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22726,16 +23119,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22729: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23122: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22732: \$? = $ac_status" >&5
+  echo "$as_me:23125: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22738: \$? = $ac_status" >&5
+  echo "$as_me:23131: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22750,8 +23143,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:22753: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:23148: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -22766,7 +23161,7 @@ echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
 fi
 
 	else
-{ { echo "$as_me:22769: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:23164: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -22789,8 +23184,10 @@ if test -n "$cf_searchpath/lib" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:22792: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:23189: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -22816,8 +23213,10 @@ if test -n "$cf_searchpath" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:22819: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:23218: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -22825,7 +23224,7 @@ echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
 fi
 
 	else
-{ { echo "$as_me:22828: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:23227: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -22836,7 +23235,7 @@ done
 
 fi;
 
-  echo "$as_me:22839: checking for iconv" >&5
+  echo "$as_me:23238: 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
@@ -22847,10 +23246,10 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me-configure}:22850: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:23249: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 22853 "configure"
+#line 23252 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -22869,16 +23268,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22872: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23271: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22875: \$? = $ac_status" >&5
+  echo "$as_me:23274: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22881: \$? = $ac_status" >&5
+  echo "$as_me:23280: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_iconv=yes
 else
@@ -22887,7 +23286,7 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_iconv=no
 
-echo "${as_me-configure}:22890: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:23289: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -22968,11 +23367,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}:22971: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:23370: 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 22975 "configure"
+#line 23374 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -22991,21 +23390,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22994: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23393: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22997: \$? = $ac_status" >&5
+  echo "$as_me:23396: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23003: \$? = $ac_status" >&5
+  echo "$as_me:23402: \$? = $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}:23008: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:23407: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -23023,7 +23422,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me-configure}:23026: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:23425: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -23091,13 +23490,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}:23094: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:23493: 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 23100 "configure"
+#line 23499 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -23116,21 +23515,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23119: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23518: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23122: \$? = $ac_status" >&5
+  echo "$as_me:23521: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23524: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23128: \$? = $ac_status" >&5
+  echo "$as_me:23527: \$? = $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}:23133: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:23532: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -23166,7 +23565,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:23169: result: $am_cv_func_iconv" >&5
+echo "$as_me:23568: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -23175,14 +23574,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:23178: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:23577: 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 23185 "configure"
+#line 23584 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -23207,16 +23606,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23210: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23609: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23213: \$? = $ac_status" >&5
+  echo "$as_me:23612: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23216: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23615: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23219: \$? = $ac_status" >&5
+  echo "$as_me:23618: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -23226,7 +23625,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23229: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:23628: 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
@@ -23268,7 +23667,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 23271 "configure"
+#line 23670 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23280,16 +23679,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23283: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23682: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23286: \$? = $ac_status" >&5
+  echo "$as_me:23685: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23688: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23292: \$? = $ac_status" >&5
+  echo "$as_me:23691: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -23304,8 +23703,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:23307: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:23708: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -23339,8 +23740,10 @@ if test -n "$cf_cv_library_path_iconv" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:23342: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:23745: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -23363,7 +23766,7 @@ curses|slang|ncurses*)
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:23366: checking if you want to use default-colors" >&5
+echo "$as_me:23769: 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.
@@ -23380,7 +23783,7 @@ else
   use_dft_colors=no
 
 fi;
-echo "$as_me:23383: result: $use_dft_colors" >&5
+echo "$as_me:23786: 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
@@ -23388,7 +23791,7 @@ EOF
 
 fi
 
-echo "$as_me:23391: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:23794: 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.
@@ -23405,13 +23808,13 @@ else
   use_kbd_layout=no
 
 fi;
-echo "$as_me:23408: result: $use_kbd_layout" >&5
+echo "$as_me:23811: 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:23414: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:23817: 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.
@@ -23428,13 +23831,13 @@ else
   use_nested_tables=no
 
 fi;
-echo "$as_me:23431: result: $use_nested_tables" >&5
+echo "$as_me:23834: 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:23437: checking if progress-bar code should be used" >&5
+echo "$as_me:23840: 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.
@@ -23451,13 +23854,13 @@ else
   use_progressbar=no
 
 fi;
-echo "$as_me:23454: result: $use_progressbar" >&5
+echo "$as_me:23857: 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:23460: checking if scrollbar code should be used" >&5
+echo "$as_me:23863: 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.
@@ -23474,10 +23877,10 @@ else
   use_scrollbar=no
 
 fi;
-echo "$as_me:23477: result: $use_scrollbar" >&5
+echo "$as_me:23880: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:23480: checking if session-caching code should be used" >&5
+echo "$as_me:23883: 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.
@@ -23494,7 +23897,7 @@ else
   use_session_cache=no
 
 fi;
-echo "$as_me:23497: result: $use_session_cache" >&5
+echo "$as_me:23900: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
     cat >>confdefs.h <<\EOF
@@ -23508,7 +23911,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:23511: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:23914: 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.
@@ -23525,13 +23928,13 @@ else
   use_alt_bindings=yes
 
 fi;
-echo "$as_me:23528: result: $use_alt_bindings" >&5
+echo "$as_me:23931: 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:23534: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:23937: 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.
@@ -23548,13 +23951,13 @@ else
   use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:23551: result: $use_ext_htmldtd" >&5
+echo "$as_me:23954: 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:23557: checking if file-upload logic should be used" >&5
+echo "$as_me:23960: 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.
@@ -23571,13 +23974,13 @@ else
   use_file_upload=yes
 
 fi;
-echo "$as_me:23574: result: $use_file_upload" >&5
+echo "$as_me:23977: 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:23580: checking if element-justification logic should be used" >&5
+echo "$as_me:23983: 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.
@@ -23594,13 +23997,13 @@ else
   use_justify_elts=yes
 
 fi;
-echo "$as_me:23597: result: $use_justify_elts" >&5
+echo "$as_me:24000: 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:23603: checking if partial-display should be used" >&5
+echo "$as_me:24006: 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.
@@ -23617,13 +24020,13 @@ else
   use_partial_display=yes
 
 fi;
-echo "$as_me:23620: result: $use_partial_display" >&5
+echo "$as_me:24023: 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:23626: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:24029: 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.
@@ -23640,13 +24043,13 @@ else
   use_filed_cookies=yes
 
 fi;
-echo "$as_me:23643: result: $use_filed_cookies" >&5
+echo "$as_me:24046: 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:23649: checking if html source should be colorized" >&5
+echo "$as_me:24052: 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.
@@ -23663,13 +24066,13 @@ else
   use_prettysrc=yes
 
 fi;
-echo "$as_me:23666: result: $use_prettysrc" >&5
+echo "$as_me:24069: 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:23672: checking if read-progress message should show ETA" >&5
+echo "$as_me:24075: 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.
@@ -23686,13 +24089,13 @@ else
   use_read_eta=yes
 
 fi;
-echo "$as_me:23689: result: $use_read_eta" >&5
+echo "$as_me:24092: 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:23695: checking if source caching should be used" >&5
+echo "$as_me:24098: 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.
@@ -23709,13 +24112,13 @@ else
   use_source_cache=yes
 
 fi;
-echo "$as_me:23712: result: $use_source_cache" >&5
+echo "$as_me:24115: 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:23718: checking if you want to use external commands" >&5
+echo "$as_me:24121: 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.
@@ -23732,7 +24135,7 @@ else
   use_externs=no
 
 fi;
-echo "$as_me:23735: result: $use_externs" >&5
+echo "$as_me:24138: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 	cat >>confdefs.h <<\EOF
@@ -23742,7 +24145,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:23745: checking if you want to use setfont support" >&5
+echo "$as_me:24148: 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.
@@ -23759,7 +24162,7 @@ else
   use_setfont=no
 
 fi;
-echo "$as_me:23762: result: $use_setfont" >&5
+echo "$as_me:24165: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -23770,7 +24173,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:23773: checking for $ac_word" >&5
+echo "$as_me:24176: 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
@@ -23787,7 +24190,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:23790: found $ac_dir/$ac_word" >&5
+   echo "$as_me:24193: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -23798,10 +24201,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:23801: result: $SETFONT" >&5
+  echo "$as_me:24204: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:23804: result: no" >&5
+  echo "$as_me:24207: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23869,7 +24272,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:23872: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:24275: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -23886,19 +24289,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me-configure}:23889: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me-configure}:24292: 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}:23896: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me-configure}:24299: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:23901: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:24304: 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
@@ -23908,7 +24311,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:23911: checking if you want cgi-link support" >&5
+echo "$as_me:24314: 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.
@@ -23924,10 +24327,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:23927: result: $enableval" >&5
+echo "$as_me:24330: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:23930: checking if you want change-exec support" >&5
+echo "$as_me:24333: 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.
@@ -23944,13 +24347,13 @@ else
   use_change_exec=no
 
 fi;
-echo "$as_me:23947: result: $use_change_exec" >&5
+echo "$as_me:24350: 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:23953: checking if you want exec-links support" >&5
+echo "$as_me:24356: 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.
@@ -23967,13 +24370,13 @@ else
   use_exec_links=$enableval
 
 fi;
-echo "$as_me:23970: result: $use_exec_links" >&5
+echo "$as_me:24373: 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:23976: checking if you want exec-scripts support" >&5
+echo "$as_me:24379: 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.
@@ -23990,13 +24393,13 @@ else
   use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:23993: result: $use_exec_scripts" >&5
+echo "$as_me:24396: 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:23999: checking if you want internal-links feature" >&5
+echo "$as_me:24402: 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.
@@ -24013,13 +24416,13 @@ else
   use_internal_links=no
 
 fi;
-echo "$as_me:24016: result: $use_internal_links" >&5
+echo "$as_me:24419: 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:24022: checking if you want to fork NSL requests" >&5
+echo "$as_me:24425: 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.
@@ -24036,13 +24439,13 @@ else
   use_nsl_fork=no
 
 fi;
-echo "$as_me:24039: result: $use_nsl_fork" >&5
+echo "$as_me:24442: 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:24045: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:24448: 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.
@@ -24059,13 +24462,13 @@ else
   use_syslog=no
 
 fi;
-echo "$as_me:24062: result: $use_syslog" >&5
+echo "$as_me:24465: 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:24068: checking if you want to underline links" >&5
+echo "$as_me:24471: 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.
@@ -24082,7 +24485,7 @@ else
   use_underline=no
 
 fi;
-echo "$as_me:24085: result: $use_underline" >&5
+echo "$as_me:24488: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 1
@@ -24092,7 +24495,7 @@ test $use_underline = no  && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:24095: checking if help files should be gzip'ed" >&5
+echo "$as_me:24498: 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.
@@ -24109,10 +24512,10 @@ else
   use_gzip_help=no
 
 fi;
-echo "$as_me:24112: result: $use_gzip_help" >&5
+echo "$as_me:24515: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:24115: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:24518: 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.
@@ -24122,7 +24525,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:24125: result: $use_bzlib" >&5
+echo "$as_me:24528: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -24161,7 +24564,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 24164 "configure"
+#line 24567 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24173,16 +24576,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24176: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24579: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24179: \$? = $ac_status" >&5
+  echo "$as_me:24582: \$? = $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:24585: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24185: \$? = $ac_status" >&5
+  echo "$as_me:24588: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24197,8 +24600,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:24200: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:24605: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -24238,7 +24643,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 24241 "configure"
+#line 24646 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24250,16 +24655,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24253: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24658: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24256: \$? = $ac_status" >&5
+  echo "$as_me:24661: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24262: \$? = $ac_status" >&5
+  echo "$as_me:24667: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24274,8 +24679,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:24277: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:24684: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -24290,7 +24697,7 @@ echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
 fi
 
 	else
-{ { echo "$as_me:24293: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:24700: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -24313,8 +24720,10 @@ if test -n "$cf_searchpath/lib" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:24316: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:24725: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -24340,8 +24749,10 @@ if test -n "$cf_searchpath" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:24343: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:24754: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -24349,7 +24760,7 @@ echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
 fi
 
 	else
-{ { echo "$as_me:24352: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:24763: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -24363,10 +24774,10 @@ done
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me-configure}:24366: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:24777: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 24369 "configure"
+#line 24780 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -24383,16 +24794,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24386: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24797: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24389: \$? = $ac_status" >&5
+  echo "$as_me:24800: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24395: \$? = $ac_status" >&5
+  echo "$as_me:24806: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_bz2=yes
 else
@@ -24401,7 +24812,7 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_bz2=no
 
-echo "${as_me-configure}:24404: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:24815: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -24482,11 +24893,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}:24485: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me-configure}:24896: 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 24489 "configure"
+#line 24900 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -24503,21 +24914,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24506: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24917: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24509: \$? = $ac_status" >&5
+  echo "$as_me:24920: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24515: \$? = $ac_status" >&5
+  echo "$as_me:24926: \$? = $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}:24520: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me-configure}:24931: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
             cf_cv_find_linkage_bz2=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -24535,7 +24946,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me-configure}:24538: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:24949: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -24543,7 +24954,7 @@ echo "${as_me-configure}:24538: testing Searching for bz2 library in FIND_LINKAG
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lbz2  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 24546 "configure"
+#line 24957 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -24560,21 +24971,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24563: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24974: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24566: \$? = $ac_status" >&5
+  echo "$as_me:24977: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24572: \$? = $ac_status" >&5
+  echo "$as_me:24983: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me-configure}:24577: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me-configure}:24988: testing ... found bz2 library in system ..." 1>&5
 
             cf_cv_find_linkage_bz2=yes
 else
@@ -24648,13 +25059,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}:24651: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me-configure}:25062: 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 24657 "configure"
+#line 25068 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -24671,21 +25082,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24674: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25085: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24677: \$? = $ac_status" >&5
+  echo "$as_me:25088: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24683: \$? = $ac_status" >&5
+  echo "$as_me:25094: \$? = $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}:24688: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me-configure}:25099: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
                 cf_cv_find_linkage_bz2=yes
                 cf_cv_library_file_bz2="-lbz2"
@@ -24740,7 +25151,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 24743 "configure"
+#line 25154 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24752,16 +25163,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24755: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25166: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24758: \$? = $ac_status" >&5
+  echo "$as_me:25169: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24764: \$? = $ac_status" >&5
+  echo "$as_me:25175: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24776,8 +25187,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:24779: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:25192: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -24808,8 +25221,10 @@ if test -n "$cf_cv_library_path_bz2" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:24811: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:25226: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -24819,7 +25234,7 @@ fi
   LIBS="-lbz2 $LIBS"
 
 else
-{ echo "$as_me:24822: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:25237: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -24829,7 +25244,7 @@ EOF
 
 fi
 
-echo "$as_me:24832: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:25247: 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.
@@ -24839,7 +25254,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:24842: result: $use_zlib" >&5
+echo "$as_me:25257: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -24878,7 +25293,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 24881 "configure"
+#line 25296 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24890,16 +25305,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24893: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25308: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24896: \$? = $ac_status" >&5
+  echo "$as_me:25311: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25314: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24902: \$? = $ac_status" >&5
+  echo "$as_me:25317: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24914,8 +25329,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:24917: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:25334: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -24955,7 +25372,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 24958 "configure"
+#line 25375 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24967,16 +25384,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24970: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25387: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24973: \$? = $ac_status" >&5
+  echo "$as_me:25390: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24976: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24979: \$? = $ac_status" >&5
+  echo "$as_me:25396: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24991,8 +25408,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:24994: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:25413: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -25007,7 +25426,7 @@ echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
 fi
 
 	else
-{ { echo "$as_me:25010: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:25429: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -25030,8 +25449,10 @@ if test -n "$cf_searchpath/lib" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:25033: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:25454: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -25057,8 +25478,10 @@ if test -n "$cf_searchpath" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:25060: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:25483: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -25066,7 +25489,7 @@ echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
 fi
 
 	else
-{ { echo "$as_me:25069: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:25492: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -25080,10 +25503,10 @@ done
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me-configure}:25083: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:25506: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 25086 "configure"
+#line 25509 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -25099,16 +25522,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25102: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25525: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25105: \$? = $ac_status" >&5
+  echo "$as_me:25528: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25111: \$? = $ac_status" >&5
+  echo "$as_me:25534: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_z=yes
 else
@@ -25117,7 +25540,7 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_z=no
 
-echo "${as_me-configure}:25120: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:25543: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -25198,11 +25621,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}:25201: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me-configure}:25624: 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 25205 "configure"
+#line 25628 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -25218,21 +25641,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25221: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25644: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25224: \$? = $ac_status" >&5
+  echo "$as_me:25647: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25230: \$? = $ac_status" >&5
+  echo "$as_me:25653: \$? = $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}:25235: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me-configure}:25658: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
             cf_cv_find_linkage_z=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -25250,7 +25673,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me-configure}:25253: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:25676: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -25258,7 +25681,7 @@ echo "${as_me-configure}:25253: testing Searching for z library in FIND_LINKAGE(
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lz  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 25261 "configure"
+#line 25684 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -25274,21 +25697,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25277: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25700: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25280: \$? = $ac_status" >&5
+  echo "$as_me:25703: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25706: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25286: \$? = $ac_status" >&5
+  echo "$as_me:25709: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me-configure}:25291: testing ... found z library in system ..." 1>&5
+echo "${as_me-configure}:25714: testing ... found z library in system ..." 1>&5
 
             cf_cv_find_linkage_z=yes
 else
@@ -25362,13 +25785,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}:25365: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me-configure}:25788: 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 25371 "configure"
+#line 25794 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -25384,21 +25807,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25387: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25810: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25390: \$? = $ac_status" >&5
+  echo "$as_me:25813: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25393: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25396: \$? = $ac_status" >&5
+  echo "$as_me:25819: \$? = $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}:25401: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me-configure}:25824: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
                 cf_cv_find_linkage_z=yes
                 cf_cv_library_file_z="-lz"
@@ -25453,7 +25876,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 25456 "configure"
+#line 25879 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25465,16 +25888,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25468: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25891: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25471: \$? = $ac_status" >&5
+  echo "$as_me:25894: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25477: \$? = $ac_status" >&5
+  echo "$as_me:25900: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -25489,8 +25912,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		fi
 
 		if test "$cf_have_incdir" = no ; then
-		  echo "$as_me:25492: result: adding $cf_add_incdir to include-path" >&5
-echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:25917: testing adding $cf_add_incdir to include-path ..." 1>&5
+
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -25521,8 +25946,10 @@ if test -n "$cf_cv_library_path_z" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        echo "$as_me:25524: result: adding $cf_add_libdir to library-path" >&5
-echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:25951: testing adding $cf_add_libdir to library-path ..." 1>&5
+
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
     fi
@@ -25532,7 +25959,7 @@ fi
   LIBS="-lz $LIBS"
 
 else
-{ echo "$as_me:25535: WARNING: Cannot find z library" >&5
+{ echo "$as_me:25962: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -25542,7 +25969,7 @@ EOF
 
 fi
 
-echo "$as_me:25545: checking if you want to exclude FINGER code" >&5
+echo "$as_me:25972: 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.
@@ -25559,13 +25986,13 @@ else
   use_finger=no
 
 fi;
-echo "$as_me:25562: result: $use_finger" >&5
+echo "$as_me:25989: 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:25568: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:25995: 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.
@@ -25582,13 +26009,13 @@ else
   use_gopher=no
 
 fi;
-echo "$as_me:25585: result: $use_gopher" >&5
+echo "$as_me:26012: 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:25591: checking if you want to exclude NEWS code" >&5
+echo "$as_me:26018: 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.
@@ -25605,13 +26032,13 @@ else
   use_news=no
 
 fi;
-echo "$as_me:25608: result: $use_news" >&5
+echo "$as_me:26035: 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:25614: checking if you want to exclude FTP code" >&5
+echo "$as_me:26041: 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.
@@ -25628,7 +26055,7 @@ else
   use_ftp=no
 
 fi;
-echo "$as_me:25631: result: $use_ftp" >&5
+echo "$as_me:26058: result: $use_ftp" >&5
 echo "${ECHO_T}$use_ftp" >&6
 test $use_ftp != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_FTP 1
@@ -25636,7 +26063,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:25639: checking if directory-editor code should be used" >&5
+echo "$as_me:26066: 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.
@@ -25653,7 +26080,7 @@ else
   use_dired=yes
 
 fi;
-echo "$as_me:25656: result: $use_dired" >&5
+echo "$as_me:26083: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -25662,7 +26089,7 @@ if test ".$use_dired" != ".no" ; then
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:25665: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:26092: 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.
@@ -25678,10 +26105,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:25681: result: $enableval" >&5
+	echo "$as_me:26108: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:25684: checking if DirEd mode should override keys" >&5
+	echo "$as_me:26111: 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.
@@ -25703,10 +26130,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:25706: result: $enableval" >&5
+	echo "$as_me:26133: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:25709: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:26136: 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.
@@ -25728,10 +26155,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:25731: result: $enableval" >&5
+	echo "$as_me:26158: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:25734: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:26161: 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.
@@ -25747,10 +26174,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:25750: result: $enableval" >&5
+	echo "$as_me:26177: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:25753: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:26180: 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.
@@ -25772,10 +26199,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:25775: result: $enableval" >&5
+	echo "$as_me:26202: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:25778: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:26205: 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.
@@ -25797,10 +26224,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:25800: result: $enableval" >&5
+	echo "$as_me:26227: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:25803: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:26230: 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.
@@ -25822,10 +26249,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:25825: result: $enableval" >&5
+	echo "$as_me:26252: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:25828: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:26255: 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.
@@ -25847,11 +26274,11 @@ else
 EOF
 
 fi;
-	echo "$as_me:25850: result: $enableval" >&5
+	echo "$as_me:26277: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:25854: checking if you want long-directory listings" >&5
+echo "$as_me:26281: 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.
@@ -25873,10 +26300,10 @@ else
 EOF
 
 fi;
-echo "$as_me:25876: result: $enableval" >&5
+echo "$as_me:26303: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:25879: checking if parent-directory references are permitted" >&5
+echo "$as_me:26306: 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.
@@ -25892,7 +26319,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:25895: result: $enableval" >&5
+echo "$as_me:26322: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -25900,7 +26327,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:25903: checking for $ac_word" >&5
+echo "$as_me:26330: 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
@@ -25917,7 +26344,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:25920: found $ac_dir/$ac_word" >&5
+   echo "$as_me:26347: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -25928,10 +26355,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:25931: result: $TELNET" >&5
+  echo "$as_me:26358: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:25934: result: no" >&5
+  echo "$as_me:26361: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25999,7 +26426,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:26002: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:26429: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -26016,7 +26443,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:26019: checking for $ac_word" >&5
+echo "$as_me:26446: 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
@@ -26033,7 +26460,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:26036: found $ac_dir/$ac_word" >&5
+   echo "$as_me:26463: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -26044,10 +26471,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:26047: result: $TN3270" >&5
+  echo "$as_me:26474: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:26050: result: no" >&5
+  echo "$as_me:26477: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26115,7 +26542,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:26118: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:26545: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -26132,7 +26559,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:26135: checking for $ac_word" >&5
+echo "$as_me:26562: 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
@@ -26149,7 +26576,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:26152: found $ac_dir/$ac_word" >&5
+   echo "$as_me:26579: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -26160,10 +26587,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:26163: result: $RLOGIN" >&5
+  echo "$as_me:26590: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:26166: result: no" >&5
+  echo "$as_me:26593: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26231,7 +26658,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:26234: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:26661: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -26248,7 +26675,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:26251: checking for $ac_word" >&5
+echo "$as_me:26678: 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
@@ -26265,7 +26692,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:26268: found $ac_dir/$ac_word" >&5
+   echo "$as_me:26695: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -26276,10 +26703,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:26279: result: $MV" >&5
+  echo "$as_me:26706: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:26282: result: no" >&5
+  echo "$as_me:26709: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26347,7 +26774,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:26350: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:26777: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -26364,7 +26791,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:26367: checking for $ac_word" >&5
+echo "$as_me:26794: 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
@@ -26381,7 +26808,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:26384: found $ac_dir/$ac_word" >&5
+   echo "$as_me:26811: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -26392,10 +26819,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:26395: result: $GZIP" >&5
+  echo "$as_me:26822: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:26398: result: no" >&5
+  echo "$as_me:26825: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26463,7 +26890,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:26466: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:26893: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -26480,7 +26907,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:26483: checking for $ac_word" >&5
+echo "$as_me:26910: 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
@@ -26497,7 +26924,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:26500: found $ac_dir/$ac_word" >&5
+   echo "$as_me:26927: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -26508,10 +26935,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:26511: result: $UNCOMPRESS" >&5
+  echo "$as_me:26938: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:26514: result: no" >&5
+  echo "$as_me:26941: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26579,7 +27006,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:26582: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:27009: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -26596,7 +27023,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:26599: checking for $ac_word" >&5
+echo "$as_me:27026: 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
@@ -26613,7 +27040,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:26616: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27043: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -26624,10 +27051,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:26627: result: $UNZIP" >&5
+  echo "$as_me:27054: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:26630: result: no" >&5
+  echo "$as_me:27057: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26695,7 +27122,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:26698: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:27125: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -26712,7 +27139,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:26715: checking for $ac_word" >&5
+echo "$as_me:27142: 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
@@ -26729,7 +27156,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:26732: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27159: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -26740,10 +27167,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:26743: result: $BZIP2" >&5
+  echo "$as_me:27170: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:26746: result: no" >&5
+  echo "$as_me:27173: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26811,7 +27238,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:26814: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:27241: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -26828,7 +27255,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:26831: checking for $ac_word" >&5
+echo "$as_me:27258: 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
@@ -26845,7 +27272,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:26848: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27275: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -26856,10 +27283,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:26859: result: $TAR" >&5
+  echo "$as_me:27286: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:26862: result: no" >&5
+  echo "$as_me:27289: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26927,7 +27354,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:26930: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:27357: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -26984,7 +27411,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:26987: checking for $ac_word" >&5
+echo "$as_me:27414: 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
@@ -27001,7 +27428,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:27004: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27431: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27012,10 +27439,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:27015: result: $COMPRESS" >&5
+  echo "$as_me:27442: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:27018: result: no" >&5
+  echo "$as_me:27445: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27083,7 +27510,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:27086: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:27513: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -27100,7 +27527,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:27103: checking for $ac_word" >&5
+echo "$as_me:27530: 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
@@ -27117,7 +27544,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:27120: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27547: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27128,10 +27555,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:27131: result: $RM" >&5
+  echo "$as_me:27558: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:27134: result: no" >&5
+  echo "$as_me:27561: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27199,7 +27626,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:27202: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:27629: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -27216,7 +27643,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:27219: checking for $ac_word" >&5
+echo "$as_me:27646: 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
@@ -27233,7 +27660,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:27236: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27663: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27244,10 +27671,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:27247: result: $UUDECODE" >&5
+  echo "$as_me:27674: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:27250: result: no" >&5
+  echo "$as_me:27677: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27315,7 +27742,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:27318: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:27745: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -27332,7 +27759,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:27335: checking for $ac_word" >&5
+echo "$as_me:27762: 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
@@ -27349,7 +27776,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:27352: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27779: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27360,10 +27787,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:27363: result: $ZCAT" >&5
+  echo "$as_me:27790: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:27366: result: no" >&5
+  echo "$as_me:27793: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27431,7 +27858,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:27434: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:27861: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -27448,7 +27875,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:27451: checking for $ac_word" >&5
+echo "$as_me:27878: 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
@@ -27465,7 +27892,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:27468: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27895: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27476,10 +27903,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:27479: result: $ZIP" >&5
+  echo "$as_me:27906: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:27482: result: no" >&5
+  echo "$as_me:27909: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27547,7 +27974,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:27550: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:27977: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -27574,7 +28001,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:27577: checking for $ac_word" >&5
+echo "$as_me:28004: 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
@@ -27591,7 +28018,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:27594: found $ac_dir/$ac_word" >&5
+   echo "$as_me:28021: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27602,10 +28029,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:27605: result: $INSTALL" >&5
+  echo "$as_me:28032: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:27608: result: no" >&5
+  echo "$as_me:28035: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27673,7 +28100,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:27676: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:28103: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -27699,7 +28126,7 @@ fi
 
 if test $cf_cv_screen = pdcurses ; then
 
-	echo "$as_me:27702: checking for X" >&5
+	echo "$as_me:28129: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -27796,17 +28223,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 27799 "configure"
+#line 28226 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:27803: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:28230: \"$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:27809: \$? = $ac_status" >&5
+  echo "$as_me:28236: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27839,7 +28266,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 27842 "configure"
+#line 28269 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -27851,16 +28278,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27854: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28281: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27857: \$? = $ac_status" >&5
+  echo "$as_me:28284: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27863: \$? = $ac_status" >&5
+  echo "$as_me:28290: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -27898,7 +28325,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:27901: result: $have_x" >&5
+  echo "$as_me:28328: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -27908,7 +28335,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:27911: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:28338: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -27932,11 +28359,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:27935: checking whether -R must be followed by a space" >&5
+      echo "$as_me:28362: 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 27939 "configure"
+#line 28366 "configure"
 #include "confdefs.h"
 
 int
@@ -27948,16 +28375,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27951: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28378: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27954: \$? = $ac_status" >&5
+  echo "$as_me:28381: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27960: \$? = $ac_status" >&5
+  echo "$as_me:28387: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -27967,13 +28394,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:27970: result: no" >&5
+	echo "$as_me:28397: 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 27976 "configure"
+#line 28403 "configure"
 #include "confdefs.h"
 
 int
@@ -27985,16 +28412,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27988: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28415: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27991: \$? = $ac_status" >&5
+  echo "$as_me:28418: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27994: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27997: \$? = $ac_status" >&5
+  echo "$as_me:28424: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -28004,11 +28431,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:28007: result: yes" >&5
+	  echo "$as_me:28434: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:28011: result: neither works" >&5
+	  echo "$as_me:28438: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -28028,7 +28455,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 28031 "configure"
+#line 28458 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28047,22 +28474,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28050: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28477: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28053: \$? = $ac_status" >&5
+  echo "$as_me:28480: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28059: \$? = $ac_status" >&5
+  echo "$as_me:28486: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:28065: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:28492: 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
@@ -28070,7 +28497,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 28073 "configure"
+#line 28500 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28089,16 +28516,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28092: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28519: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28095: \$? = $ac_status" >&5
+  echo "$as_me:28522: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28098: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28101: \$? = $ac_status" >&5
+  echo "$as_me:28528: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -28109,14 +28536,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28112: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:28539: 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:28119: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:28546: 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
@@ -28124,7 +28551,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 28127 "configure"
+#line 28554 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28143,16 +28570,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28146: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28573: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28149: \$? = $ac_status" >&5
+  echo "$as_me:28576: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28155: \$? = $ac_status" >&5
+  echo "$as_me:28582: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -28163,7 +28590,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28166: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:28593: 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"
@@ -28182,13 +28609,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:28185: checking for gethostbyname" >&5
+    echo "$as_me:28612: 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 28191 "configure"
+#line 28618 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -28219,16 +28646,16 @@ f = gethostbyname;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28222: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28649: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28225: \$? = $ac_status" >&5
+  echo "$as_me:28652: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28231: \$? = $ac_status" >&5
+  echo "$as_me:28658: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -28238,11 +28665,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28241: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:28668: 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:28245: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:28672: 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
@@ -28250,7 +28677,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 28253 "configure"
+#line 28680 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28269,16 +28696,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28272: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28699: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28275: \$? = $ac_status" >&5
+  echo "$as_me:28702: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28281: \$? = $ac_status" >&5
+  echo "$as_me:28708: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -28289,14 +28716,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28292: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:28719: 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:28299: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:28726: 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
@@ -28304,7 +28731,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 28307 "configure"
+#line 28734 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28323,16 +28750,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28326: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28753: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28329: \$? = $ac_status" >&5
+  echo "$as_me:28756: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28335: \$? = $ac_status" >&5
+  echo "$as_me:28762: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -28343,7 +28770,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28346: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:28773: 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"
@@ -28359,13 +28786,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:28362: checking for connect" >&5
+    echo "$as_me:28789: 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 28368 "configure"
+#line 28795 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -28396,16 +28823,16 @@ f = connect;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28399: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28826: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28402: \$? = $ac_status" >&5
+  echo "$as_me:28829: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28405: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28408: \$? = $ac_status" >&5
+  echo "$as_me:28835: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -28415,11 +28842,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28418: result: $ac_cv_func_connect" >&5
+echo "$as_me:28845: 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:28422: checking for connect in -lsocket" >&5
+      echo "$as_me:28849: 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
@@ -28427,7 +28854,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 28430 "configure"
+#line 28857 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28446,16 +28873,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28449: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28876: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28452: \$? = $ac_status" >&5
+  echo "$as_me:28879: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28455: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28458: \$? = $ac_status" >&5
+  echo "$as_me:28885: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -28466,7 +28893,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28469: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:28896: 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"
@@ -28475,13 +28902,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:28478: checking for remove" >&5
+    echo "$as_me:28905: 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 28484 "configure"
+#line 28911 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -28512,16 +28939,16 @@ f = remove;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28515: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28942: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28518: \$? = $ac_status" >&5
+  echo "$as_me:28945: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28948: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28524: \$? = $ac_status" >&5
+  echo "$as_me:28951: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -28531,11 +28958,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28534: result: $ac_cv_func_remove" >&5
+echo "$as_me:28961: 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:28538: checking for remove in -lposix" >&5
+      echo "$as_me:28965: 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
@@ -28543,7 +28970,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 28546 "configure"
+#line 28973 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28562,16 +28989,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28565: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28992: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28568: \$? = $ac_status" >&5
+  echo "$as_me:28995: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28574: \$? = $ac_status" >&5
+  echo "$as_me:29001: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -28582,7 +29009,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28585: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:29012: 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"
@@ -28591,13 +29018,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:28594: checking for shmat" >&5
+    echo "$as_me:29021: 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 28600 "configure"
+#line 29027 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -28628,16 +29055,16 @@ f = shmat;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28631: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28634: \$? = $ac_status" >&5
+  echo "$as_me:29061: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28637: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28640: \$? = $ac_status" >&5
+  echo "$as_me:29067: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -28647,11 +29074,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28650: result: $ac_cv_func_shmat" >&5
+echo "$as_me:29077: 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:28654: checking for shmat in -lipc" >&5
+      echo "$as_me:29081: 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
@@ -28659,7 +29086,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 28662 "configure"
+#line 29089 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28678,16 +29105,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28681: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29108: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28684: \$? = $ac_status" >&5
+  echo "$as_me:29111: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28690: \$? = $ac_status" >&5
+  echo "$as_me:29117: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -28698,7 +29125,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28701: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:29128: 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"
@@ -28716,7 +29143,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:28719: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:29146: 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
@@ -28724,7 +29151,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 28727 "configure"
+#line 29154 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28743,16 +29170,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28746: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29173: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28749: \$? = $ac_status" >&5
+  echo "$as_me:29176: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28755: \$? = $ac_status" >&5
+  echo "$as_me:29182: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -28763,7 +29190,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28766: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:29193: 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"
@@ -28781,7 +29208,7 @@ LDFLAGS="$X_LIBS $LDFLAGS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:28784: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me-configure}:29211: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -28842,7 +29269,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}:28845: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me-configure}:29272: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -28850,7 +29277,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}:28853: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me-configure}:29280: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
 fi
@@ -28858,14 +29285,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}:28861: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me-configure}:29288: 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 28868 "configure"
+#line 29295 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -28877,16 +29304,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28880: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29307: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28883: \$? = $ac_status" >&5
+  echo "$as_me:29310: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28889: \$? = $ac_status" >&5
+  echo "$as_me:29316: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -28894,12 +29321,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:28897: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me-configure}:29324: 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}:28902: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me-configure}:29329: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -28907,13 +29334,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:28910: checking for XOpenDisplay" >&5
+echo "$as_me:29337: 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 28916 "configure"
+#line 29343 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -28944,16 +29371,16 @@ f = XOpenDisplay;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28947: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29374: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28950: \$? = $ac_status" >&5
+  echo "$as_me:29377: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28953: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28956: \$? = $ac_status" >&5
+  echo "$as_me:29383: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -28963,13 +29390,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28966: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:29393: 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:28972: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:29399: 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
@@ -28977,7 +29404,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 28980 "configure"
+#line 29407 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28996,16 +29423,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28999: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29426: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29002: \$? = $ac_status" >&5
+  echo "$as_me:29429: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29008: \$? = $ac_status" >&5
+  echo "$as_me:29435: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -29016,7 +29443,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:29019: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:29446: 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"
@@ -29024,13 +29451,13 @@ fi
 
 fi
 
-echo "$as_me:29027: checking for XtAppInitialize" >&5
+echo "$as_me:29454: 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 29033 "configure"
+#line 29460 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -29061,16 +29488,16 @@ f = XtAppInitialize;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29064: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29491: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29067: \$? = $ac_status" >&5
+  echo "$as_me:29494: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29070: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29497: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29073: \$? = $ac_status" >&5
+  echo "$as_me:29500: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -29080,13 +29507,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29083: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:29510: 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:29089: checking for XtAppInitialize in -lXt" >&5
+echo "$as_me:29516: 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
@@ -29094,7 +29521,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 29097 "configure"
+#line 29524 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -29113,16 +29540,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29116: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29543: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29119: \$? = $ac_status" >&5
+  echo "$as_me:29546: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29549: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29125: \$? = $ac_status" >&5
+  echo "$as_me:29552: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -29133,7 +29560,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:29136: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:29563: 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
@@ -29147,7 +29574,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:29150: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:29577: 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
@@ -29157,7 +29584,7 @@ fi
 
 cf_x_athena=${cf_x_athena-Xaw}
 
-echo "$as_me:29160: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:29587: 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=
 
@@ -29168,14 +29595,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:29171: result: yes" >&5
+	echo "$as_me:29598: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:29174: result: no" >&5
+	echo "$as_me:29601: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:29178: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:29605: 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=
 
@@ -29186,14 +29613,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:29189: result: yes" >&5
+	echo "$as_me:29616: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:29192: result: no" >&5
+	echo "$as_me:29619: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:29196: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:29623: 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=
 
@@ -29204,14 +29631,14 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:29207: result: yes" >&5
+	echo "$as_me:29634: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:29210: result: no" >&5
+	echo "$as_me:29637: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:29214: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:29641: 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
@@ -29219,7 +29646,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 29222 "configure"
+#line 29649 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -29238,16 +29665,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29241: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29668: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29244: \$? = $ac_status" >&5
+  echo "$as_me:29671: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29247: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29250: \$? = $ac_status" >&5
+  echo "$as_me:29677: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -29258,7 +29685,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:29261: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:29688: 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"
@@ -29280,14 +29707,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:29283: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:29710: 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:29286: checking for $cf_test" >&5
+			echo "$as_me:29713: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 29290 "configure"
+#line 29717 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -29301,16 +29728,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29731: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29307: \$? = $ac_status" >&5
+  echo "$as_me:29734: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29313: \$? = $ac_status" >&5
+  echo "$as_me:29740: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -29319,7 +29746,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:29322: result: $cf_result" >&5
+		echo "$as_me:29749: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_include=$cf_path
@@ -29331,7 +29758,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_include" ; then
-	{ echo "$as_me:29334: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:29761: 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"
@@ -29356,15 +29783,15 @@ do
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
-				echo "$as_me:29359: checking for $cf_lib in $cf_path" >&5
+				echo "$as_me:29786: 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:29363: checking for $cf_test in $cf_lib" >&5
+				echo "$as_me:29790: 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 29367 "configure"
+#line 29794 "configure"
 #include "confdefs.h"
 
 int
@@ -29376,16 +29803,16 @@ $cf_test()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29379: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29806: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29382: \$? = $ac_status" >&5
+  echo "$as_me:29809: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29388: \$? = $ac_status" >&5
+  echo "$as_me:29815: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -29394,7 +29821,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:29397: result: $cf_result" >&5
+			echo "$as_me:29824: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
@@ -29406,7 +29833,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:29409: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:29836: 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
@@ -29421,7 +29848,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:29424: checking for $ac_word" >&5
+echo "$as_me:29851: 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
@@ -29438,7 +29865,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:29441: found $ac_dir/$ac_word" >&5
+   echo "$as_me:29868: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29449,10 +29876,10 @@ fi
 XCURSES_CONFIG=$ac_cv_path_XCURSES_CONFIG
 
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:29452: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:29879: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:29455: result: no" >&5
+  echo "$as_me:29882: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29473,7 +29900,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:29476: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me-configure}:29903: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -29534,7 +29961,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}:29537: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me-configure}:29964: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -29542,7 +29969,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}:29545: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me-configure}:29972: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
 fi
@@ -29550,14 +29977,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}:29553: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me-configure}:29980: 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 29560 "configure"
+#line 29987 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29569,16 +29996,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29999: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29575: \$? = $ac_status" >&5
+  echo "$as_me:30002: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29581: \$? = $ac_status" >&5
+  echo "$as_me:30008: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29586,12 +30013,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:29589: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me-configure}:30016: 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}:29594: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me-configure}:30021: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -29599,7 +30026,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:29602: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:30029: 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
@@ -29607,7 +30034,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 29610 "configure"
+#line 30037 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -29626,16 +30053,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29629: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30056: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29632: \$? = $ac_status" >&5
+  echo "$as_me:30059: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29635: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29638: \$? = $ac_status" >&5
+  echo "$as_me:30065: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -29646,13 +30073,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:29649: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:30076: 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:29655: checking for XCurses library" >&5
+echo "$as_me:30082: 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
@@ -29660,7 +30087,7 @@ else
 
 LIBS="-lXCurses $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 29663 "configure"
+#line 30090 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -29675,16 +30102,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29678: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30105: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29681: \$? = $ac_status" >&5
+  echo "$as_me:30108: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29684: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29687: \$? = $ac_status" >&5
+  echo "$as_me:30114: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -29695,7 +30122,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29698: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:30125: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -29714,14 +30141,14 @@ EOF
 EOF
 
 else
-	{ { echo "$as_me:29717: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:30144: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
 
-echo "$as_me:29724: checking if we can include termio.h with curses" >&5
+echo "$as_me:30151: 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
@@ -29731,7 +30158,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 29734 "configure"
+#line 30161 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -29745,16 +30172,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29748: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30175: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29751: \$? = $ac_status" >&5
+  echo "$as_me:30178: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29754: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29757: \$? = $ac_status" >&5
+  echo "$as_me:30184: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -29767,7 +30194,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:29770: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:30197: 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
@@ -29782,23 +30209,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:29785: checking for $ac_header" >&5
+echo "$as_me:30212: 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 29791 "configure"
+#line 30218 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:29795: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:30222: \"$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:29801: \$? = $ac_status" >&5
+  echo "$as_me:30228: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -29817,7 +30244,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:29820: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:30247: 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
@@ -29827,7 +30254,7 @@ EOF
 fi
 done
 
-echo "$as_me:29830: checking if curses supports alternate-character set" >&5
+echo "$as_me:30257: 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
@@ -29836,7 +30263,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 29839 "configure"
+#line 30266 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -29850,16 +30277,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29853: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30280: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29856: \$? = $ac_status" >&5
+  echo "$as_me:30283: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29859: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29862: \$? = $ac_status" >&5
+  echo "$as_me:30289: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -29873,20 +30300,20 @@ done
 
 fi
 
-echo "$as_me:29876: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:30303: 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:29882: checking if curses supports fancy attributes" >&5
+echo "$as_me:30309: 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 29889 "configure"
+#line 30316 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -29904,16 +30331,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29907: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30334: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29910: \$? = $ac_status" >&5
+  echo "$as_me:30337: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30340: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29916: \$? = $ac_status" >&5
+  echo "$as_me:30343: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -29925,13 +30352,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:29928: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:30355: 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:29934: checking for function curses_version" >&5
+echo "$as_me:30361: 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
@@ -29941,7 +30368,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29944 "configure"
+#line 30371 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -29954,15 +30381,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29957: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30384: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29960: \$? = $ac_status" >&5
+  echo "$as_me:30387: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30389: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29965: \$? = $ac_status" >&5
+  echo "$as_me:30392: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -29977,21 +30404,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:29980: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:30407: 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:29987: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:30414: 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 29994 "configure"
+#line 30421 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -30010,16 +30437,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30013: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30440: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30016: \$? = $ac_status" >&5
+  echo "$as_me:30443: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30022: \$? = $ac_status" >&5
+  echo "$as_me:30449: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -30031,10 +30458,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:30034: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:30461: 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:30037: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:30464: 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
@@ -30043,14 +30470,14 @@ EOF
 fi
 fi
 
-echo "$as_me:30046: checking if curses supports color attributes" >&5
+echo "$as_me:30473: 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 30053 "configure"
+#line 30480 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -30070,16 +30497,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30073: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30500: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30076: \$? = $ac_status" >&5
+  echo "$as_me:30503: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30082: \$? = $ac_status" >&5
+  echo "$as_me:30509: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -30091,7 +30518,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:30094: result: $cf_cv_color_curses" >&5
+echo "$as_me:30521: 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
@@ -30111,23 +30538,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:30114: checking for $ac_header" >&5
+echo "$as_me:30541: 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 30120 "configure"
+#line 30547 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:30124: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:30551: \"$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:30130: \$? = $ac_status" >&5
+  echo "$as_me:30557: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -30146,7 +30573,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:30149: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:30576: 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
@@ -30161,23 +30588,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:30164: checking for $ac_header" >&5
+echo "$as_me:30591: 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 30170 "configure"
+#line 30597 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:30174: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:30601: \"$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:30180: \$? = $ac_status" >&5
+  echo "$as_me:30607: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -30196,7 +30623,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:30199: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:30626: 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
@@ -30214,10 +30641,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:30217: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:30644: 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 30220 "configure"
+#line 30647 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -30229,16 +30656,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30232: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30659: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30235: \$? = $ac_status" >&5
+  echo "$as_me:30662: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30238: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30241: \$? = $ac_status" >&5
+  echo "$as_me:30668: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -30246,7 +30673,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 30249 "configure"
+#line 30676 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -30260,16 +30687,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30263: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30690: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30266: \$? = $ac_status" >&5
+  echo "$as_me:30693: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30696: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30272: \$? = $ac_status" >&5
+  echo "$as_me:30699: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -30284,12 +30711,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:30287: result: $termios_bad" >&5
+	echo "$as_me:30714: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:30292: checking declaration of size-change" >&5
+echo "$as_me:30719: 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
@@ -30304,7 +30731,7 @@ do
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 30307 "configure"
+#line 30734 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -30348,16 +30775,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30351: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30778: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30354: \$? = $ac_status" >&5
+  echo "$as_me:30781: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30357: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30784: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30360: \$? = $ac_status" >&5
+  echo "$as_me:30787: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -30376,7 +30803,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:30379: result: $cf_cv_sizechange" >&5
+echo "$as_me:30806: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 	cat >>confdefs.h <<\EOF
@@ -30393,14 +30820,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:30396: checking if ttytype is declared in curses library" >&5
+echo "$as_me:30823: 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 30403 "configure"
+#line 30830 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -30412,16 +30839,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30415: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30842: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30418: \$? = $ac_status" >&5
+  echo "$as_me:30845: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30424: \$? = $ac_status" >&5
+  echo "$as_me:30851: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -30433,7 +30860,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:30436: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:30863: 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
@@ -30441,14 +30868,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:30444: checking if curses supports wide characters" >&5
+echo "$as_me:30871: 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 30451 "configure"
+#line 30878 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -30467,16 +30894,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30470: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30897: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30473: \$? = $ac_status" >&5
+  echo "$as_me:30900: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30903: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30479: \$? = $ac_status" >&5
+  echo "$as_me:30906: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -30487,7 +30914,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30490: result: $cf_cv_widec_curses" >&5
+echo "$as_me:30917: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -30496,14 +30923,14 @@ if test "$cf_cv_widec_curses" = yes ; then
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:30499: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:30926: 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 30506 "configure"
+#line 30933 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -30517,23 +30944,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30520: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30947: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30523: \$? = $ac_status" >&5
+  echo "$as_me:30950: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30526: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30953: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30529: \$? = $ac_status" >&5
+  echo "$as_me:30956: \$? = $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 30536 "configure"
+#line 30963 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -30548,16 +30975,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30551: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30978: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30554: \$? = $ac_status" >&5
+  echo "$as_me:30981: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30560: \$? = $ac_status" >&5
+  echo "$as_me:30987: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -30569,7 +30996,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:30572: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:30999: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -30590,14 +31017,14 @@ fi
 
 	fi
 
-echo "$as_me:30593: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:31020: 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 30600 "configure"
+#line 31027 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -30614,23 +31041,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30617: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31044: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30620: \$? = $ac_status" >&5
+  echo "$as_me:31047: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30623: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30626: \$? = $ac_status" >&5
+  echo "$as_me:31053: \$? = $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 30633 "configure"
+#line 31060 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -30648,16 +31075,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30651: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31078: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30654: \$? = $ac_status" >&5
+  echo "$as_me:31081: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30660: \$? = $ac_status" >&5
+  echo "$as_me:31087: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -30669,11 +31096,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:30672: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:31099: 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:30676: checking for term.h" >&5
+echo "$as_me:31103: 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
@@ -30686,7 +31113,7 @@ for cf_header in \
 	term.h
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 30689 "configure"
+#line 31116 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -30700,16 +31127,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30703: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31130: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30706: \$? = $ac_status" >&5
+  echo "$as_me:31133: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30712: \$? = $ac_status" >&5
+  echo "$as_me:31139: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -30722,7 +31149,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:30725: result: $cf_cv_term_header" >&5
+echo "$as_me:31152: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -30773,10 +31200,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:30776: checking for ${cf_func}" >&5
+	echo "$as_me:31203: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me-configure}:30779: testing ${cf_func} ..." 1>&5
+echo "${as_me-configure}:31206: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -30785,7 +31212,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 30788 "configure"
+#line 31215 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -30819,16 +31246,16 @@ ${cf_cv_main_return-return}(foo == 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30822: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31249: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30825: \$? = $ac_status" >&5
+  echo "$as_me:31252: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30831: \$? = $ac_status" >&5
+  echo "$as_me:31258: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -30844,7 +31271,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:30847: result: $cf_result" >&5
+	echo "$as_me:31274: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -30860,13 +31287,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:30863: checking for $ac_func" >&5
+echo "$as_me:31290: 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 30869 "configure"
+#line 31296 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -30897,16 +31324,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30900: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31327: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30903: \$? = $ac_status" >&5
+  echo "$as_me:31330: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31333: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30909: \$? = $ac_status" >&5
+  echo "$as_me:31336: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -30916,7 +31343,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30919: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:31346: 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
@@ -30930,12 +31357,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:30933: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:31360: 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:30938: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:31365: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -30943,7 +31370,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:30946: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:31373: 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
@@ -31048,7 +31475,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:31051: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:31478: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -31224,7 +31651,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:31227: error: ambiguous option: $1
+    { { echo "$as_me:31654: 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;}
@@ -31243,7 +31670,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:31246: error: unrecognized option: $1
+  -*) { { echo "$as_me:31673: 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;}
@@ -31296,7 +31723,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:31299: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:31726: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -31613,7 +32040,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:31616: creating $ac_file" >&5
+    { echo "$as_me:32043: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -31631,7 +32058,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:31634: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:32061: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -31644,7 +32071,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:31647: error: cannot find input file: $f" >&5
+           { { echo "$as_me:32074: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -31710,7 +32137,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:31713: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:32140: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -31721,7 +32148,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:31724: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:32151: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -31734,7 +32161,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:31737: error: cannot find input file: $f" >&5
+           { { echo "$as_me:32164: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -31852,7 +32279,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:31855: $ac_file is unchanged" >&5
+      { echo "$as_me:32282: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \