about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--CHANGES4
-rw-r--r--aclocal.m419
-rwxr-xr-xconfigure8378
3 files changed, 3831 insertions, 4570 deletions
diff --git a/CHANGES b/CHANGES
index fdf385d9..4f13737a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
--- $LynxId: CHANGES,v 1.760 2014/12/03 00:42:32 tom Exp $
+-- $LynxId: CHANGES,v 1.761 2014/12/04 11:28:52 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
@@ -32,6 +32,8 @@ Changes since Lynx 2.8 release
     testing - prcs does not build with this option.
   + CF_MAKEFLAGS:  workaround for GNU make 4.0 incompatibility with previous
     releases.
+  + CF_SUBDIR_PATH:  add /usr/pkg and /opt/local to help configuring with
+    pkgsrc and macports -TD
   + CF_XOPEN_SOURCE:  Minix3.2 ifdef's the POSIX.1-2001 functions inside
     _NETBSD_SOURCE, even though it was released 2012-02-29 - appease it.  At
     the same time, turn on the verbose flag to show that most platforms need
diff --git a/aclocal.m4 b/aclocal.m4
index 13986070..3a72bc65 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $LynxId: aclocal.m4,v 1.214 2014/11/30 23:23:25 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.215 2014/12/04 11:27:54 tom Exp $
 dnl Macros for auto-configure script.
 dnl by Thomas E. Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
@@ -5501,7 +5501,7 @@ if test "$ac_cv_header_termios_h" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SUBDIR_PATH version: 6 updated: 2010/04/21 06:20:50
+dnl CF_SUBDIR_PATH version: 7 updated: 2014/12/04 04:33:06
 dnl --------------
 dnl Construct a search-list for a nonstandard header/lib-file
 dnl	$1 = the variable to return as result
@@ -5511,11 +5511,18 @@ AC_DEFUN([CF_SUBDIR_PATH],
 [
 $1=
 
-CF_ADD_SUBDIR_PATH($1,$2,$3,/usr,$prefix)
 CF_ADD_SUBDIR_PATH($1,$2,$3,$prefix,NONE)
-CF_ADD_SUBDIR_PATH($1,$2,$3,/usr/local,$prefix)
-CF_ADD_SUBDIR_PATH($1,$2,$3,/opt,$prefix)
-CF_ADD_SUBDIR_PATH($1,$2,$3,[$]HOME,$prefix)
+
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	[$]HOME
+do
+	CF_ADD_SUBDIR_PATH($1,$2,$3,$cf_subdir_prefix,$prefix)
+done
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_SYSTEM_MAIL_FLAGS version: 4 updated: 2012/11/08 20:57:52
diff --git a/configure b/configure
index a472b1f7..db617b5a 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in 2.8.9dev.2.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20121002.
+# Generated by Autoconf 2.52.20141204.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -880,7 +880,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20121002.  Invocation command line was
+generated by GNU Autoconf 2.52.20141204.  Invocation command line was
 
   $ $0 $@
 
@@ -1086,9 +1086,9 @@ 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
 
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
+case `echo "testing\c" 2>/dev/null; echo 1,2,3`,`echo -n testing 2>/dev/null; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C=	# newlines do not sed ;-) only broken shells would use this case anyway
+		   ECHO_T='	' ;;
   *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
   *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
 esac
@@ -7100,17 +7100,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/iconv &&       cf_search="$cf_search /usr/include/iconv"
-	test -d /usr/include/iconv/include &&    cf_search="$cf_search /usr/include/iconv/include"
-	test -d /usr/iconv/include &&       cf_search="$cf_search /usr/iconv/include"
-	test -d /usr/iconv/include/iconv &&    cf_search="$cf_search /usr/iconv/include/iconv"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -7122,38 +7111,27 @@ test -d "$prefix" && \
 	test -d $prefix/iconv/include/iconv &&    cf_search="$cf_search $prefix/iconv/include/iconv"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/iconv &&       cf_search="$cf_search /usr/local/include/iconv"
-	test -d /usr/local/include/iconv/include &&    cf_search="$cf_search /usr/local/include/iconv/include"
-	test -d /usr/local/iconv/include &&       cf_search="$cf_search /usr/local/iconv/include"
-	test -d /usr/local/iconv/include/iconv &&    cf_search="$cf_search /usr/local/iconv/include/iconv"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/iconv &&       cf_search="$cf_search /opt/include/iconv"
-	test -d /opt/include/iconv/include &&    cf_search="$cf_search /opt/include/iconv/include"
-	test -d /opt/iconv/include &&       cf_search="$cf_search /opt/iconv/include"
-	test -d /opt/iconv/include/iconv &&    cf_search="$cf_search /opt/iconv/include/iconv"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/iconv &&       cf_search="$cf_search $cf_subdir_prefix/include/iconv"
+	test -d $cf_subdir_prefix/include/iconv/include &&    cf_search="$cf_search $cf_subdir_prefix/include/iconv/include"
+	test -d $cf_subdir_prefix/iconv/include &&       cf_search="$cf_search $cf_subdir_prefix/iconv/include"
+	test -d $cf_subdir_prefix/iconv/include/iconv &&    cf_search="$cf_search $cf_subdir_prefix/iconv/include/iconv"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/iconv &&       cf_search="$cf_search $HOME/include/iconv"
-	test -d $HOME/include/iconv/include &&    cf_search="$cf_search $HOME/include/iconv/include"
-	test -d $HOME/iconv/include &&       cf_search="$cf_search $HOME/iconv/include"
-	test -d $HOME/iconv/include/iconv &&    cf_search="$cf_search $HOME/iconv/include/iconv"
-}
+done
 
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
@@ -7176,11 +7154,11 @@ cf_search="$cf_search $cf_header_path_list"
       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}:7179: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7157: 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 7183 "configure"
+#line 7161 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7199,21 +7177,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7202: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7180: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7205: \$? = $ac_status" >&5
+  echo "$as_me:7183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7211: \$? = $ac_status" >&5
+  echo "$as_me:7189: \$? = $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}:7216: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7194: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7231,7 +7209,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:7234: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:7212: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -7266,17 +7244,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/iconv &&       cf_search="$cf_search /usr/lib/iconv"
-	test -d /usr/lib/iconv/lib &&    cf_search="$cf_search /usr/lib/iconv/lib"
-	test -d /usr/iconv/lib &&       cf_search="$cf_search /usr/iconv/lib"
-	test -d /usr/iconv/lib/iconv &&    cf_search="$cf_search /usr/iconv/lib/iconv"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -7288,38 +7255,27 @@ test -d "$prefix" && \
 	test -d $prefix/iconv/lib/iconv &&    cf_search="$cf_search $prefix/iconv/lib/iconv"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/iconv &&       cf_search="$cf_search /usr/local/lib/iconv"
-	test -d /usr/local/lib/iconv/lib &&    cf_search="$cf_search /usr/local/lib/iconv/lib"
-	test -d /usr/local/iconv/lib &&       cf_search="$cf_search /usr/local/iconv/lib"
-	test -d /usr/local/iconv/lib/iconv &&    cf_search="$cf_search /usr/local/iconv/lib/iconv"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/iconv &&       cf_search="$cf_search /opt/lib/iconv"
-	test -d /opt/lib/iconv/lib &&    cf_search="$cf_search /opt/lib/iconv/lib"
-	test -d /opt/iconv/lib &&       cf_search="$cf_search /opt/iconv/lib"
-	test -d /opt/iconv/lib/iconv &&    cf_search="$cf_search /opt/iconv/lib/iconv"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/iconv &&       cf_search="$cf_search $cf_subdir_prefix/lib/iconv"
+	test -d $cf_subdir_prefix/lib/iconv/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/iconv/lib"
+	test -d $cf_subdir_prefix/iconv/lib &&       cf_search="$cf_search $cf_subdir_prefix/iconv/lib"
+	test -d $cf_subdir_prefix/iconv/lib/iconv &&    cf_search="$cf_search $cf_subdir_prefix/iconv/lib/iconv"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/iconv &&       cf_search="$cf_search $HOME/lib/iconv"
-	test -d $HOME/lib/iconv/lib &&    cf_search="$cf_search $HOME/lib/iconv/lib"
-	test -d $HOME/iconv/lib &&       cf_search="$cf_search $HOME/iconv/lib"
-	test -d $HOME/iconv/lib/iconv &&    cf_search="$cf_search $HOME/iconv/lib/iconv"
-}
+done
 
 cf_search="$cf_library_path_list $cf_search"
 
@@ -7328,13 +7284,13 @@ cf_search="$cf_library_path_list $cf_search"
           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}:7331: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7287: 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 7337 "configure"
+#line 7293 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7353,21 +7309,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7356: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7312: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7359: \$? = $ac_status" >&5
+  echo "$as_me:7315: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7365: \$? = $ac_status" >&5
+  echo "$as_me:7321: \$? = $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}:7370: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7326: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -7407,7 +7363,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:7410: result: $am_cv_func_iconv" >&5
+echo "$as_me:7366: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -7416,14 +7372,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:7419: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:7375: 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 7426 "configure"
+#line 7382 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7448,16 +7404,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7451: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7407: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7454: \$? = $ac_status" >&5
+  echo "$as_me:7410: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7457: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7460: \$? = $ac_status" >&5
+  echo "$as_me:7416: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -7467,7 +7423,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7470: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:7426: 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
@@ -7509,7 +7465,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 7512 "configure"
+#line 7468 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7521,16 +7477,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7524: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7480: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7527: \$? = $ac_status" >&5
+  echo "$as_me:7483: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7533: \$? = $ac_status" >&5
+  echo "$as_me:7489: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7547,7 +7503,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:7550: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7506: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -7584,7 +7540,7 @@ if test -n "$cf_cv_library_path_iconv" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7587: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7543: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -7595,13 +7551,13 @@ fi
     fi
   fi
 
-  echo "$as_me:7598: checking for nl_langinfo and CODESET" >&5
+  echo "$as_me:7554: 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 7604 "configure"
+#line 7560 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -7613,16 +7569,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7616: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7619: \$? = $ac_status" >&5
+  echo "$as_me:7575: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7622: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7625: \$? = $ac_status" >&5
+  echo "$as_me:7581: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -7633,7 +7589,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:7636: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:7592: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
   if test $am_cv_langinfo_codeset = yes; then
 
@@ -7644,13 +7600,13 @@ EOF
   fi
 
    if test $ac_cv_header_locale_h = yes; then
-    echo "$as_me:7647: checking for LC_MESSAGES" >&5
+    echo "$as_me:7603: 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 7653 "configure"
+#line 7609 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -7662,16 +7618,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7668: \$? = $ac_status" >&5
+  echo "$as_me:7624: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7674: \$? = $ac_status" >&5
+  echo "$as_me:7630: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -7681,7 +7637,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7684: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:7640: 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
 
@@ -7691,7 +7647,7 @@ EOF
 
     fi
   fi
-   echo "$as_me:7694: checking whether NLS is requested" >&5
+   echo "$as_me:7650: 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.
@@ -7701,7 +7657,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=no
 fi;
-  echo "$as_me:7704: result: $USE_NLS" >&5
+  echo "$as_me:7660: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
   BUILD_INCLUDED_LIBINTL=no
@@ -7714,7 +7670,7 @@ cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
-    echo "$as_me:7717: checking whether included gettext is requested" >&5
+    echo "$as_me:7673: 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.
@@ -7724,7 +7680,7 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-    echo "$as_me:7727: result: $nls_cv_force_use_gnu_gettext" >&5
+    echo "$as_me:7683: 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"
@@ -7749,7 +7705,7 @@ do
 done
 LIBS="$cf_add_libs"
 
-      echo "$as_me:7752: checking for libintl.h and gettext()" >&5
+      echo "$as_me:7708: 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
@@ -7760,12 +7716,12 @@ else
 cf_cv_header_path_intl=
 cf_cv_library_path_intl=
 
-echo "${as_me:-configure}:7763: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7719: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7768 "configure"
+#line 7724 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -7785,16 +7741,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7788: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7744: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7791: \$? = $ac_status" >&5
+  echo "$as_me:7747: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7797: \$? = $ac_status" >&5
+  echo "$as_me:7753: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -7808,7 +7764,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lintl  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7811 "configure"
+#line 7767 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -7828,16 +7784,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7831: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7787: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7834: \$? = $ac_status" >&5
+  echo "$as_me:7790: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7837: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7793: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7840: \$? = $ac_status" >&5
+  echo "$as_me:7796: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -7854,9 +7810,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for intl library" 1>&6
 
-echo "${as_me:-configure}:7857: testing find linkage for intl library ..." 1>&5
+echo "${as_me:-configure}:7813: testing find linkage for intl library ..." 1>&5
 
-echo "${as_me:-configure}:7859: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7815: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7893,17 +7849,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/intl &&       cf_search="$cf_search /usr/include/intl"
-	test -d /usr/include/intl/include &&    cf_search="$cf_search /usr/include/intl/include"
-	test -d /usr/intl/include &&       cf_search="$cf_search /usr/intl/include"
-	test -d /usr/intl/include/intl &&    cf_search="$cf_search /usr/intl/include/intl"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -7915,38 +7860,27 @@ test -d "$prefix" && \
 	test -d $prefix/intl/include/intl &&    cf_search="$cf_search $prefix/intl/include/intl"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/intl &&       cf_search="$cf_search /usr/local/include/intl"
-	test -d /usr/local/include/intl/include &&    cf_search="$cf_search /usr/local/include/intl/include"
-	test -d /usr/local/intl/include &&       cf_search="$cf_search /usr/local/intl/include"
-	test -d /usr/local/intl/include/intl &&    cf_search="$cf_search /usr/local/intl/include/intl"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/intl &&       cf_search="$cf_search /opt/include/intl"
-	test -d /opt/include/intl/include &&    cf_search="$cf_search /opt/include/intl/include"
-	test -d /opt/intl/include &&       cf_search="$cf_search /opt/intl/include"
-	test -d /opt/intl/include/intl &&    cf_search="$cf_search /opt/intl/include/intl"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/intl &&       cf_search="$cf_search $cf_subdir_prefix/include/intl"
+	test -d $cf_subdir_prefix/include/intl/include &&    cf_search="$cf_search $cf_subdir_prefix/include/intl/include"
+	test -d $cf_subdir_prefix/intl/include &&       cf_search="$cf_search $cf_subdir_prefix/intl/include"
+	test -d $cf_subdir_prefix/intl/include/intl &&    cf_search="$cf_search $cf_subdir_prefix/intl/include/intl"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/intl &&       cf_search="$cf_search $HOME/include/intl"
-	test -d $HOME/include/intl/include &&    cf_search="$cf_search $HOME/include/intl/include"
-	test -d $HOME/intl/include &&       cf_search="$cf_search $HOME/intl/include"
-	test -d $HOME/intl/include/intl &&    cf_search="$cf_search $HOME/intl/include/intl"
-}
+done
 
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
@@ -7969,11 +7903,11 @@ cf_search="$cf_search $cf_header_path_list"
       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}:7972: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:7906: 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 7976 "configure"
+#line 7910 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -7993,21 +7927,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7996: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7930: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7999: \$? = $ac_status" >&5
+  echo "$as_me:7933: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8005: \$? = $ac_status" >&5
+  echo "$as_me:7939: \$? = $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}:8010: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:7944: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
 
             cf_cv_find_linkage_intl=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8025,7 +7959,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_intl" = maybe ; then
 
-echo "${as_me:-configure}:8028: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7962: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -8060,17 +7994,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/intl &&       cf_search="$cf_search /usr/lib/intl"
-	test -d /usr/lib/intl/lib &&    cf_search="$cf_search /usr/lib/intl/lib"
-	test -d /usr/intl/lib &&       cf_search="$cf_search /usr/intl/lib"
-	test -d /usr/intl/lib/intl &&    cf_search="$cf_search /usr/intl/lib/intl"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -8082,38 +8005,27 @@ test -d "$prefix" && \
 	test -d $prefix/intl/lib/intl &&    cf_search="$cf_search $prefix/intl/lib/intl"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/intl &&       cf_search="$cf_search /usr/local/lib/intl"
-	test -d /usr/local/lib/intl/lib &&    cf_search="$cf_search /usr/local/lib/intl/lib"
-	test -d /usr/local/intl/lib &&       cf_search="$cf_search /usr/local/intl/lib"
-	test -d /usr/local/intl/lib/intl &&    cf_search="$cf_search /usr/local/intl/lib/intl"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/intl &&       cf_search="$cf_search /opt/lib/intl"
-	test -d /opt/lib/intl/lib &&    cf_search="$cf_search /opt/lib/intl/lib"
-	test -d /opt/intl/lib &&       cf_search="$cf_search /opt/intl/lib"
-	test -d /opt/intl/lib/intl &&    cf_search="$cf_search /opt/intl/lib/intl"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/intl &&       cf_search="$cf_search $cf_subdir_prefix/lib/intl"
+	test -d $cf_subdir_prefix/lib/intl/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/intl/lib"
+	test -d $cf_subdir_prefix/intl/lib &&       cf_search="$cf_search $cf_subdir_prefix/intl/lib"
+	test -d $cf_subdir_prefix/intl/lib/intl &&    cf_search="$cf_search $cf_subdir_prefix/intl/lib/intl"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/intl &&       cf_search="$cf_search $HOME/lib/intl"
-	test -d $HOME/lib/intl/lib &&    cf_search="$cf_search $HOME/lib/intl/lib"
-	test -d $HOME/intl/lib &&       cf_search="$cf_search $HOME/intl/lib"
-	test -d $HOME/intl/lib/intl &&    cf_search="$cf_search $HOME/intl/lib/intl"
-}
+done
 
 cf_search="$cf_library_path_list $cf_search"
 
@@ -8122,13 +8034,13 @@ cf_search="$cf_library_path_list $cf_search"
           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}:8125: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:8037: 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 8131 "configure"
+#line 8043 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -8148,21 +8060,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8151: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8063: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8154: \$? = $ac_status" >&5
+  echo "$as_me:8066: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8160: \$? = $ac_status" >&5
+  echo "$as_me:8072: \$? = $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}:8165: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:8077: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
 
                 cf_cv_find_linkage_intl=yes
                 cf_cv_library_file_intl="-lintl"
@@ -8202,7 +8114,7 @@ cf_cv_func_gettext=no
 fi
 
 fi
-echo "$as_me:8205: result: $cf_cv_func_gettext" >&5
+echo "$as_me:8117: result: $cf_cv_func_gettext" >&5
 echo "${ECHO_T}$cf_cv_func_gettext" >&6
       LIBS="$cf_save_LIBS_1"
 
@@ -8242,7 +8154,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 8245 "configure"
+#line 8157 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8254,16 +8166,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8257: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8169: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8260: \$? = $ac_status" >&5
+  echo "$as_me:8172: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8266: \$? = $ac_status" >&5
+  echo "$as_me:8178: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8280,7 +8192,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8283: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8195: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8317,7 +8229,7 @@ if test -n "$cf_cv_library_path_intl" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:8320: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:8232: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         INTLLIBS="-L$cf_add_libdir $INTLLIBS"
       fi
@@ -8333,13 +8245,13 @@ fi
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8336: checking for $ac_func" >&5
+echo "$as_me:8248: 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 8342 "configure"
+#line 8254 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8370,16 +8282,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8373: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8285: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8376: \$? = $ac_status" >&5
+  echo "$as_me:8288: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8379: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8291: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8382: \$? = $ac_status" >&5
+  echo "$as_me:8294: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8389,7 +8301,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8392: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8304: 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
@@ -8404,7 +8316,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:8407: checking for $ac_word" >&5
+echo "$as_me:8319: 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
@@ -8431,16 +8343,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:8434: result: $MSGFMT" >&5
+  echo "$as_me:8346: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:8437: result: no" >&5
+  echo "$as_me:8349: 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:8443: checking for $ac_word" >&5
+echo "$as_me:8355: 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
@@ -8457,7 +8369,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:8460: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8372: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8469,17 +8381,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:8472: result: $GMSGFMT" >&5
+  echo "$as_me:8384: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:8475: result: no" >&5
+  echo "$as_me:8387: 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:8482: checking for $ac_word" >&5
+echo "$as_me:8394: 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
@@ -8506,10 +8418,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:8509: result: $XGETTEXT" >&5
+  echo "$as_me:8421: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:8512: result: no" >&5
+  echo "$as_me:8424: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8524,7 +8436,7 @@ fi
 
     if test "$nls_cv_use_gnu_gettext" = "yes"; then
       if test ! -d $srcdir/intl ; then
-        { { echo "$as_me:8527: error: no NLS library is packaged with this application" >&5
+        { { echo "$as_me:8439: 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
@@ -8532,7 +8444,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:8535: checking for $ac_word" >&5
+echo "$as_me:8447: 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
@@ -8559,16 +8471,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:8562: result: $MSGFMT" >&5
+  echo "$as_me:8474: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:8565: result: no" >&5
+  echo "$as_me:8477: 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:8571: checking for $ac_word" >&5
+echo "$as_me:8483: 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
@@ -8585,7 +8497,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:8588: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8500: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8597,17 +8509,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:8600: result: $GMSGFMT" >&5
+  echo "$as_me:8512: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:8603: result: no" >&5
+  echo "$as_me:8515: 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:8610: checking for $ac_word" >&5
+echo "$as_me:8522: 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
@@ -8634,10 +8546,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:8637: result: $XGETTEXT" >&5
+  echo "$as_me:8549: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:8640: result: no" >&5
+  echo "$as_me:8552: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8652,7 +8564,7 @@ fi
                   if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
         : ;
       else
-        echo "$as_me:8655: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+        echo "$as_me:8567: 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
@@ -8662,7 +8574,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:8665: result: found xgettext program is not GNU xgettext; ignore it" >&5
+        echo "$as_me:8577: 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
@@ -8682,7 +8594,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:8685: checking for $ac_word" >&5
+echo "$as_me:8597: 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
@@ -8697,7 +8609,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:8700: found $ac_dir/$ac_word" >&5
+echo "$as_me:8612: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8705,10 +8617,10 @@ fi
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
-  echo "$as_me:8708: result: $INTLBISON" >&5
+  echo "$as_me:8620: result: $INTLBISON" >&5
 echo "${ECHO_T}$INTLBISON" >&6
 else
-  echo "$as_me:8711: result: no" >&5
+  echo "$as_me:8623: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8718,7 +8630,7 @@ done
     if test -z "$INTLBISON"; then
       ac_verc_fail=yes
     else
-            echo "$as_me:8721: checking version of bison" >&5
+            echo "$as_me:8633: 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
@@ -8727,7 +8639,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:8730: result: $ac_prog_version" >&5
+    echo "$as_me:8642: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
     fi
     if test $ac_verc_fail = yes; then
@@ -8753,7 +8665,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:8756: checking for catalogs to be installed" >&5
+       echo "$as_me:8668: 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
@@ -8773,7 +8685,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:8776: result: $LINGUAS" >&5
+       echo "$as_me:8688: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -8809,7 +8721,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d $srcdir/po ; then
-echo "$as_me:8812: checking if we should use included message-library" >&5
+echo "$as_me:8724: 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.
@@ -8820,7 +8732,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:8823: result: $use_our_messages" >&5
+echo "$as_me:8735: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -8862,23 +8774,23 @@ else
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8865: checking for $ac_header" >&5
+echo "$as_me:8777: 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 8871 "configure"
+#line 8783 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8875: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8787: \"$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:8881: \$? = $ac_status" >&5
+  echo "$as_me:8793: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8897,7 +8809,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8900: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8812: 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
@@ -8983,7 +8895,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:8986: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:8898: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -8992,7 +8904,7 @@ esac
 fi
 eval NLS_DATADIR="$withval"
 
-echo "$as_me:8995: checking if you want full utility pathnames" >&5
+echo "$as_me:8907: 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.
@@ -9009,14 +8921,14 @@ else
   with_full_paths=yes
 
 fi;
-echo "$as_me:9012: result: $with_full_paths" >&5
+echo "$as_me:8924: 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:9019: checking for system mailer" >&5
+echo "$as_me:8931: 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
@@ -9036,14 +8948,14 @@ else
 
 fi
 
-echo "$as_me:9039: result: $cf_cv_SYSTEM_MAIL" >&5
+echo "$as_me:8951: 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:9046: checking system mail flags" >&5
+echo "$as_me:8958: 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
@@ -9059,7 +8971,7 @@ else
 
 fi
 
-echo "$as_me:9062: result: $cf_cv_system_mail_flags" >&5
+echo "$as_me:8974: result: $cf_cv_system_mail_flags" >&5
 echo "${ECHO_T}$cf_cv_system_mail_flags" >&6
 
 cat >>confdefs.h <<EOF
@@ -9110,14 +9022,14 @@ irix[56].*) #(vi
 	;;
 linux*|gnu*|mint*|k*bsd*-gnu) #(vi
 
-echo "$as_me:9113: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:9025: 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 9120 "configure"
+#line 9032 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9132,16 +9044,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9135: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9047: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9138: \$? = $ac_status" >&5
+  echo "$as_me:9050: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9144: \$? = $ac_status" >&5
+  echo "$as_me:9056: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -9150,7 +9062,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9153 "configure"
+#line 9065 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9165,16 +9077,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9168: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9080: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9171: \$? = $ac_status" >&5
+  echo "$as_me:9083: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9177: \$? = $ac_status" >&5
+  echo "$as_me:9089: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -9189,7 +9101,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9192: result: $cf_cv_gnu_source" >&5
+echo "$as_me:9104: 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"
 
@@ -9214,16 +9126,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:9217: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:9129: 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}:9223: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:9135: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9226 "configure"
+#line 9138 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9238,16 +9150,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9241: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9153: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9244: \$? = $ac_status" >&5
+  echo "$as_me:9156: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9247: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9250: \$? = $ac_status" >&5
+  echo "$as_me:9162: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -9268,7 +9180,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9271 "configure"
+#line 9183 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9283,16 +9195,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9286: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9198: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9289: \$? = $ac_status" >&5
+  echo "$as_me:9201: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9295: \$? = $ac_status" >&5
+  echo "$as_me:9207: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9303,15 +9215,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me:-configure}:9306: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:9218: 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}:9311: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:9223: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9314 "configure"
+#line 9226 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9326,16 +9238,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9329: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9241: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9332: \$? = $ac_status" >&5
+  echo "$as_me:9244: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9338: \$? = $ac_status" >&5
+  echo "$as_me:9250: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9351,7 +9263,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9354: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:9266: 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
@@ -9469,14 +9381,14 @@ sysv4.2uw2.*) # Novell/SCO UnixWare 2.x (tested on 2.1.2)
 	;;
 *)
 
-echo "$as_me:9472: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:9384: 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 9479 "configure"
+#line 9391 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9495,16 +9407,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9498: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9410: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9501: \$? = $ac_status" >&5
+  echo "$as_me:9413: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9416: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9507: \$? = $ac_status" >&5
+  echo "$as_me:9419: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -9513,7 +9425,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9516 "configure"
+#line 9428 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9532,16 +9444,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9535: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9447: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9538: \$? = $ac_status" >&5
+  echo "$as_me:9450: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9541: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9544: \$? = $ac_status" >&5
+  echo "$as_me:9456: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -9556,7 +9468,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9559: result: $cf_cv_xopen_source" >&5
+echo "$as_me:9471: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -9664,16 +9576,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:9667: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:9579: 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}:9673: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:9585: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9676 "configure"
+#line 9588 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9688,16 +9600,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9691: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9603: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9694: \$? = $ac_status" >&5
+  echo "$as_me:9606: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9700: \$? = $ac_status" >&5
+  echo "$as_me:9612: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -9718,7 +9630,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9721 "configure"
+#line 9633 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9733,16 +9645,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9736: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9648: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9739: \$? = $ac_status" >&5
+  echo "$as_me:9651: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9742: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9745: \$? = $ac_status" >&5
+  echo "$as_me:9657: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9753,15 +9665,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me:-configure}:9756: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:9668: 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}:9761: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:9673: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9764 "configure"
+#line 9676 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9776,16 +9688,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9779: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9691: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9782: \$? = $ac_status" >&5
+  echo "$as_me:9694: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9785: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9697: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9788: \$? = $ac_status" >&5
+  echo "$as_me:9700: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9801,7 +9713,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9804: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:9716: 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
@@ -9959,7 +9871,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}:9962: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:9874: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -9967,7 +9879,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}:9970: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:9882: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -9975,7 +9887,7 @@ 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}:9978: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:9890: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
@@ -9983,10 +9895,10 @@ fi
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:9986: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:9898: checking if _XOPEN_SOURCE really is set" >&5
 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9989 "configure"
+#line 9901 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -10001,16 +9913,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10004: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9916: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10007: \$? = $ac_status" >&5
+  echo "$as_me:9919: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10013: \$? = $ac_status" >&5
+  echo "$as_me:9925: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -10019,12 +9931,12 @@ cat conftest.$ac_ext >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:10022: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:9934: result: $cf_XOPEN_SOURCE_set" >&5
 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
 	if test $cf_XOPEN_SOURCE_set = yes
 	then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 10027 "configure"
+#line 9939 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -10039,16 +9951,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10042: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9954: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10045: \$? = $ac_status" >&5
+  echo "$as_me:9957: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10051: \$? = $ac_status" >&5
+  echo "$as_me:9963: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -10059,19 +9971,19 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		if test $cf_XOPEN_SOURCE_set_ok = no
 		then
-			{ echo "$as_me:10062: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:9974: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:10067: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:9979: 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 10074 "configure"
+#line 9986 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10090,16 +10002,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10093: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10005: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10096: \$? = $ac_status" >&5
+  echo "$as_me:10008: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10102: \$? = $ac_status" >&5
+  echo "$as_me:10014: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -10108,7 +10020,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 10111 "configure"
+#line 10023 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10127,16 +10039,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10130: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10042: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10133: \$? = $ac_status" >&5
+  echo "$as_me:10045: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10136: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10139: \$? = $ac_status" >&5
+  echo "$as_me:10051: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -10151,7 +10063,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10154: result: $cf_cv_xopen_source" >&5
+echo "$as_me:10066: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -10249,14 +10161,14 @@ fi
 	fi
 fi
 
-echo "$as_me:10252: checking if SIGWINCH is defined" >&5
+echo "$as_me:10164: 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 10259 "configure"
+#line 10171 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -10271,23 +10183,23 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10274: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10186: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10277: \$? = $ac_status" >&5
+  echo "$as_me:10189: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10192: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10283: \$? = $ac_status" >&5
+  echo "$as_me:10195: \$? = $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 10290 "configure"
+#line 10202 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -10305,16 +10217,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10308: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10220: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10311: \$? = $ac_status" >&5
+  echo "$as_me:10223: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10314: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10317: \$? = $ac_status" >&5
+  echo "$as_me:10229: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -10328,11 +10240,11 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10331: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:10243: 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:10335: checking for actual SIGWINCH definition" >&5
+echo "$as_me:10247: 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
@@ -10343,7 +10255,7 @@ cf_sigwinch=32
 while test $cf_sigwinch != 1
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10346 "configure"
+#line 10258 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -10365,16 +10277,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10368: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10280: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10371: \$? = $ac_status" >&5
+  echo "$as_me:10283: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10377: \$? = $ac_status" >&5
+  echo "$as_me:10289: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -10388,7 +10300,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
 done
 
 fi
-echo "$as_me:10391: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:10303: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -10400,7 +10312,7 @@ if test -n "$TRY_CFLAGS" ; then
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:10403: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:10315: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -10471,7 +10383,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}:10474: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:10386: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -10479,7 +10391,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}:10482: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:10394: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -10487,14 +10399,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}:10490: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:10402: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 10497 "configure"
+#line 10409 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10506,16 +10418,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10509: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10512: \$? = $ac_status" >&5
+  echo "$as_me:10424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10518: \$? = $ac_status" >&5
+  echo "$as_me:10430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10523,12 +10435,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:10526: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:10438: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:10531: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:10443: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -10540,7 +10452,7 @@ fi
 
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
-echo "$as_me:10543: checking if you want NSS compatible SSL libraries" >&5
+echo "$as_me:10455: 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
@@ -10555,10 +10467,10 @@ else
 fi;
 
 fi
-echo "$as_me:10558: result: $cf_cv_use_libnss_compat" >&5
+echo "$as_me:10470: result: $cf_cv_use_libnss_compat" >&5
 echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6
 
-echo "$as_me:10561: checking if you want ssl library" >&5
+echo "$as_me:10473: 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
@@ -10573,10 +10485,10 @@ else
 fi;
 
 fi
-echo "$as_me:10576: result: $cf_cv_use_libssl" >&5
+echo "$as_me:10488: result: $cf_cv_use_libssl" >&5
 echo "${ECHO_T}$cf_cv_use_libssl" >&6
 
-echo "$as_me:10579: checking if you want gnutls support" >&5
+echo "$as_me:10491: 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
@@ -10591,11 +10503,11 @@ else
 fi;
 
 fi
-echo "$as_me:10594: result: $cf_cv_use_libgnutls" >&5
+echo "$as_me:10506: result: $cf_cv_use_libgnutls" >&5
 echo "${ECHO_T}$cf_cv_use_libgnutls" >&6
 
 # this option is mainly for comparing with/without Lynx's wrapper for GNUTLS.
-echo "$as_me:10598: checking if you want gnutls-openssl compat" >&5
+echo "$as_me:10510: checking if you want gnutls-openssl compat" >&5
 echo $ECHO_N "checking if you want gnutls-openssl compat... $ECHO_C" >&6
 if test "${cf_cv_gnutls_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10610,10 +10522,10 @@ else
 fi;
 
 fi
-echo "$as_me:10613: result: $cf_cv_gnutls_compat" >&5
+echo "$as_me:10525: result: $cf_cv_gnutls_compat" >&5
 echo "${ECHO_T}$cf_cv_gnutls_compat" >&6
 
-echo "$as_me:10616: checking if you want socks library" >&5
+echo "$as_me:10528: 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
@@ -10628,10 +10540,10 @@ else
 fi;
 
 fi
-echo "$as_me:10631: result: $cf_cv_use_libsocks" >&5
+echo "$as_me:10543: result: $cf_cv_use_libsocks" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks" >&6
 
-echo "$as_me:10634: checking if you want socks5 library" >&5
+echo "$as_me:10546: 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
@@ -10646,7 +10558,7 @@ else
 fi;
 
 fi
-echo "$as_me:10649: result: $cf_cv_use_libsocks5" >&5
+echo "$as_me:10561: result: $cf_cv_use_libsocks5" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6
 
 if test "x$cf_cv_use_libsocks" != xno ; then
@@ -10685,7 +10597,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 10688 "configure"
+#line 10600 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10697,16 +10609,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10700: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10612: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10703: \$? = $ac_status" >&5
+  echo "$as_me:10615: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10618: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10709: \$? = $ac_status" >&5
+  echo "$as_me:10621: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10723,7 +10635,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10726: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10638: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10764,7 +10676,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 10767 "configure"
+#line 10679 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10776,16 +10688,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10779: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10691: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10782: \$? = $ac_status" >&5
+  echo "$as_me:10694: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10785: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10697: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10788: \$? = $ac_status" >&5
+  echo "$as_me:10700: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10802,7 +10714,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10805: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10717: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10818,7 +10730,7 @@ echo "${as_me:-configure}:10805: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:10821: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:10733: 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
@@ -10843,7 +10755,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:10846: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10758: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -10872,7 +10784,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:10875: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10787: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -10881,7 +10793,7 @@ echo "${as_me:-configure}:10875: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:10884: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:10796: 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
@@ -10895,12 +10807,12 @@ done
 cf_cv_header_path_socks=
 cf_cv_library_path_socks=
 
-echo "${as_me:-configure}:10898: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:10810: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10903 "configure"
+#line 10815 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -10916,16 +10828,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10919: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10831: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10922: \$? = $ac_status" >&5
+  echo "$as_me:10834: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10837: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10928: \$? = $ac_status" >&5
+  echo "$as_me:10840: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -10939,7 +10851,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lsocks  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10942 "configure"
+#line 10854 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -10955,16 +10867,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10958: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10870: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10961: \$? = $ac_status" >&5
+  echo "$as_me:10873: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10876: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10967: \$? = $ac_status" >&5
+  echo "$as_me:10879: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -10981,9 +10893,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for socks library" 1>&6
 
-echo "${as_me:-configure}:10984: testing find linkage for socks library ..." 1>&5
+echo "${as_me:-configure}:10896: testing find linkage for socks library ..." 1>&5
 
-echo "${as_me:-configure}:10986: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:10898: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11020,17 +10932,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/socks &&       cf_search="$cf_search /usr/include/socks"
-	test -d /usr/include/socks/include &&    cf_search="$cf_search /usr/include/socks/include"
-	test -d /usr/socks/include &&       cf_search="$cf_search /usr/socks/include"
-	test -d /usr/socks/include/socks &&    cf_search="$cf_search /usr/socks/include/socks"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -11042,38 +10943,27 @@ test -d "$prefix" && \
 	test -d $prefix/socks/include/socks &&    cf_search="$cf_search $prefix/socks/include/socks"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/socks &&       cf_search="$cf_search /usr/local/include/socks"
-	test -d /usr/local/include/socks/include &&    cf_search="$cf_search /usr/local/include/socks/include"
-	test -d /usr/local/socks/include &&       cf_search="$cf_search /usr/local/socks/include"
-	test -d /usr/local/socks/include/socks &&    cf_search="$cf_search /usr/local/socks/include/socks"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/socks &&       cf_search="$cf_search /opt/include/socks"
-	test -d /opt/include/socks/include &&    cf_search="$cf_search /opt/include/socks/include"
-	test -d /opt/socks/include &&       cf_search="$cf_search /opt/socks/include"
-	test -d /opt/socks/include/socks &&    cf_search="$cf_search /opt/socks/include/socks"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/socks &&       cf_search="$cf_search $cf_subdir_prefix/include/socks"
+	test -d $cf_subdir_prefix/include/socks/include &&    cf_search="$cf_search $cf_subdir_prefix/include/socks/include"
+	test -d $cf_subdir_prefix/socks/include &&       cf_search="$cf_search $cf_subdir_prefix/socks/include"
+	test -d $cf_subdir_prefix/socks/include/socks &&    cf_search="$cf_search $cf_subdir_prefix/socks/include/socks"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/socks &&       cf_search="$cf_search $HOME/include/socks"
-	test -d $HOME/include/socks/include &&    cf_search="$cf_search $HOME/include/socks/include"
-	test -d $HOME/socks/include &&       cf_search="$cf_search $HOME/socks/include"
-	test -d $HOME/socks/include/socks &&    cf_search="$cf_search $HOME/socks/include/socks"
-}
+done
 
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
@@ -11096,11 +10986,11 @@ cf_search="$cf_search $cf_header_path_list"
       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}:11099: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:10989: 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 11103 "configure"
+#line 10993 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11116,21 +11006,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11119: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11009: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11122: \$? = $ac_status" >&5
+  echo "$as_me:11012: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11015: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11128: \$? = $ac_status" >&5
+  echo "$as_me:11018: \$? = $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}:11133: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:11023: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
 
             cf_cv_find_linkage_socks=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11148,7 +11038,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_socks" = maybe ; then
 
-echo "${as_me:-configure}:11151: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:11041: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -11183,17 +11073,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/socks &&       cf_search="$cf_search /usr/lib/socks"
-	test -d /usr/lib/socks/lib &&    cf_search="$cf_search /usr/lib/socks/lib"
-	test -d /usr/socks/lib &&       cf_search="$cf_search /usr/socks/lib"
-	test -d /usr/socks/lib/socks &&    cf_search="$cf_search /usr/socks/lib/socks"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -11205,38 +11084,27 @@ test -d "$prefix" && \
 	test -d $prefix/socks/lib/socks &&    cf_search="$cf_search $prefix/socks/lib/socks"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/socks &&       cf_search="$cf_search /usr/local/lib/socks"
-	test -d /usr/local/lib/socks/lib &&    cf_search="$cf_search /usr/local/lib/socks/lib"
-	test -d /usr/local/socks/lib &&       cf_search="$cf_search /usr/local/socks/lib"
-	test -d /usr/local/socks/lib/socks &&    cf_search="$cf_search /usr/local/socks/lib/socks"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/socks &&       cf_search="$cf_search /opt/lib/socks"
-	test -d /opt/lib/socks/lib &&    cf_search="$cf_search /opt/lib/socks/lib"
-	test -d /opt/socks/lib &&       cf_search="$cf_search /opt/socks/lib"
-	test -d /opt/socks/lib/socks &&    cf_search="$cf_search /opt/socks/lib/socks"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/socks &&       cf_search="$cf_search $cf_subdir_prefix/lib/socks"
+	test -d $cf_subdir_prefix/lib/socks/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/socks/lib"
+	test -d $cf_subdir_prefix/socks/lib &&       cf_search="$cf_search $cf_subdir_prefix/socks/lib"
+	test -d $cf_subdir_prefix/socks/lib/socks &&    cf_search="$cf_search $cf_subdir_prefix/socks/lib/socks"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/socks &&       cf_search="$cf_search $HOME/lib/socks"
-	test -d $HOME/lib/socks/lib &&    cf_search="$cf_search $HOME/lib/socks/lib"
-	test -d $HOME/socks/lib &&       cf_search="$cf_search $HOME/socks/lib"
-	test -d $HOME/socks/lib/socks &&    cf_search="$cf_search $HOME/socks/lib/socks"
-}
+done
 
 cf_search="$cf_library_path_list $cf_search"
 
@@ -11245,13 +11113,13 @@ cf_search="$cf_library_path_list $cf_search"
           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}:11248: testing ... testing $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:11116: 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 11254 "configure"
+#line 11122 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11267,21 +11135,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11270: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11138: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11273: \$? = $ac_status" >&5
+  echo "$as_me:11141: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11279: \$? = $ac_status" >&5
+  echo "$as_me:11147: \$? = $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}:11284: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:11152: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
 
                 cf_cv_find_linkage_socks=yes
                 cf_cv_library_file_socks="-lsocks"
@@ -11340,7 +11208,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 11343 "configure"
+#line 11211 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11352,16 +11220,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11355: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11223: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11358: \$? = $ac_status" >&5
+  echo "$as_me:11226: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11364: \$? = $ac_status" >&5
+  echo "$as_me:11232: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11378,7 +11246,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11381: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11249: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11412,7 +11280,7 @@ if test -n "$cf_cv_library_path_socks" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:11415: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11283: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11437,7 +11305,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:11440: WARNING: Cannot find socks library" >&5
+{ echo "$as_me:11308: WARNING: Cannot find socks library" >&5
 echo "$as_me: WARNING: Cannot find socks library" >&2;}
 fi
 
@@ -11480,7 +11348,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
   else
-    { { echo "$as_me:11483: error: cannot link with socks library" >&5
+    { { echo "$as_me:11351: error: cannot link with socks library" >&5
 echo "$as_me: error: cannot link with socks library" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -11521,7 +11389,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11524 "configure"
+#line 11392 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11533,16 +11401,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11536: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11404: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11539: \$? = $ac_status" >&5
+  echo "$as_me:11407: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11542: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11410: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11545: \$? = $ac_status" >&5
+  echo "$as_me:11413: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11559,7 +11427,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11562: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11430: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11600,7 +11468,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11603 "configure"
+#line 11471 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11612,16 +11480,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11615: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11483: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11618: \$? = $ac_status" >&5
+  echo "$as_me:11486: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11624: \$? = $ac_status" >&5
+  echo "$as_me:11492: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11638,7 +11506,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11641: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11509: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11654,7 +11522,7 @@ echo "${as_me:-configure}:11641: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:11657: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:11525: 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
@@ -11679,7 +11547,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:11682: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11550: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11708,7 +11576,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:11711: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11579: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11717,7 +11585,7 @@ echo "${as_me:-configure}:11711: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:11720: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:11588: 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
@@ -11750,11 +11618,11 @@ cat >>confdefs.h <<\EOF
 #define SOCKS 1
 EOF
 
-echo "$as_me:11753: checking if the socks library uses socks4 prefix" >&5
+echo "$as_me:11621: 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 11757 "configure"
+#line 11625 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -11768,16 +11636,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11771: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11639: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11774: \$? = $ac_status" >&5
+  echo "$as_me:11642: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11780: \$? = $ac_status" >&5
+  echo "$as_me:11648: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -11789,7 +11657,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 11792 "configure"
+#line 11660 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int
@@ -11801,29 +11669,29 @@ SOCKSinit((char *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11804: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11672: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11807: \$? = $ac_status" >&5
+  echo "$as_me:11675: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11813: \$? = $ac_status" >&5
+  echo "$as_me:11681: \$? = $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:11819: error: Cannot link with socks5 library" >&5
+{ { echo "$as_me:11687: 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:11826: result: $cf_use_socks4" >&5
+echo "$as_me:11694: result: $cf_use_socks4" >&5
 echo "${ECHO_T}$cf_use_socks4" >&6
 
 if test "$cf_use_socks4" = "yes" ; then
@@ -11878,10 +11746,10 @@ EOF
 
 fi
 
-echo "$as_me:11881: checking if socks5p.h is available" >&5
+echo "$as_me:11749: 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 11884 "configure"
+#line 11752 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -11896,16 +11764,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11899: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11767: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11902: \$? = $ac_status" >&5
+  echo "$as_me:11770: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11908: \$? = $ac_status" >&5
+  echo "$as_me:11776: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_use_socks5p_h=yes
 else
@@ -11914,7 +11782,7 @@ cat conftest.$ac_ext >&5
 cf_use_socks5p_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:11917: result: $cf_use_socks5p_h" >&5
+echo "$as_me:11785: result: $cf_use_socks5p_h" >&5
 echo "${ECHO_T}$cf_use_socks5p_h" >&6
 
 test "$cf_use_socks5p_h" = yes &&
@@ -11926,14 +11794,14 @@ else
 
 cf_test_netlibs=no
 
-echo "$as_me:11929: checking for network libraries" >&5
+echo "$as_me:11797: 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:11936: result: working..." >&5
+echo "$as_me:11804: result: working..." >&5
 echo "${ECHO_T}working..." >&6
 
 cf_cv_netlibs=""
@@ -11945,23 +11813,23 @@ mingw*) # (vi
 for ac_header in windows.h winsock.h winsock2.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11948: checking for $ac_header" >&5
+echo "$as_me:11816: 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 11954 "configure"
+#line 11822 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11958: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11826: \"$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:11964: \$? = $ac_status" >&5
+  echo "$as_me:11832: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11980,7 +11848,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11983: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11851: 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
@@ -12015,7 +11883,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12018 "configure"
+#line 11886 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_WINDOWS_H
@@ -12042,22 +11910,22 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12045: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11913: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12048: \$? = $ac_status" >&5
+  echo "$as_me:11916: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12054: \$? = $ac_status" >&5
+  echo "$as_me:11922: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_netlibs="$cf_winsock_lib $cf_cv_netlibs"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:12060: error: Cannot link against winsock library" >&5
+{ { echo "$as_me:11928: error: Cannot link against winsock library" >&5
 echo "$as_me: error: Cannot link against winsock library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12070,13 +11938,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 for ac_func in gethostname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12073: checking for $ac_func" >&5
+echo "$as_me:11941: 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 12079 "configure"
+#line 11947 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12107,16 +11975,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12110: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11978: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12113: \$? = $ac_status" >&5
+  echo "$as_me:11981: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12119: \$? = $ac_status" >&5
+  echo "$as_me:11987: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12126,7 +11994,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12129: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11997: 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
@@ -12135,7 +12003,7 @@ EOF
 
 else
 
-echo "$as_me:12138: checking for gethostname in -lnsl" >&5
+echo "$as_me:12006: 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
@@ -12143,7 +12011,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12146 "configure"
+#line 12014 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12162,16 +12030,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12165: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12033: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12168: \$? = $ac_status" >&5
+  echo "$as_me:12036: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12174: \$? = $ac_status" >&5
+  echo "$as_me:12042: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -12182,7 +12050,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12185: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:12053: 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
 
@@ -12199,7 +12067,7 @@ else
 	ac_cv_func_gethostname=unknown
 	unset ac_cv_func_gethostname 2>/dev/null
 
-echo "$as_me:12202: checking for gethostname in -lsocket" >&5
+echo "$as_me:12070: 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
@@ -12207,7 +12075,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12210 "configure"
+#line 12078 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12226,16 +12094,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12229: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12097: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12232: \$? = $ac_status" >&5
+  echo "$as_me:12100: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12235: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12238: \$? = $ac_status" >&5
+  echo "$as_me:12106: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_gethostname=yes
 else
@@ -12246,7 +12114,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12249: result: $ac_cv_lib_socket_gethostname" >&5
+echo "$as_me:12117: 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
 
@@ -12270,7 +12138,7 @@ fi
 fi
 done
 
-	echo "$as_me:12273: checking for main in -linet" >&5
+	echo "$as_me:12141: 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
@@ -12278,7 +12146,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12281 "configure"
+#line 12149 "configure"
 #include "confdefs.h"
 
 int
@@ -12290,16 +12158,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12161: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12296: \$? = $ac_status" >&5
+  echo "$as_me:12164: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12302: \$? = $ac_status" >&5
+  echo "$as_me:12170: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_inet_main=yes
 else
@@ -12310,7 +12178,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12313: result: $ac_cv_lib_inet_main" >&5
+echo "$as_me:12181: 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"
@@ -12321,13 +12189,13 @@ fi
 for ac_func in socket
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12324: checking for $ac_func" >&5
+echo "$as_me:12192: 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 12330 "configure"
+#line 12198 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12358,16 +12226,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12229: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12364: \$? = $ac_status" >&5
+  echo "$as_me:12232: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12235: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12370: \$? = $ac_status" >&5
+  echo "$as_me:12238: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12377,7 +12245,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12380: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12248: 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
@@ -12386,7 +12254,7 @@ EOF
 
 else
 
-echo "$as_me:12389: checking for socket in -lsocket" >&5
+echo "$as_me:12257: 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
@@ -12394,7 +12262,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12397 "configure"
+#line 12265 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12413,16 +12281,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12284: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12419: \$? = $ac_status" >&5
+  echo "$as_me:12287: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12425: \$? = $ac_status" >&5
+  echo "$as_me:12293: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -12433,7 +12301,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12436: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:12304: 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
 
@@ -12450,7 +12318,7 @@ else
 	ac_cv_func_socket=unknown
 	unset ac_cv_func_socket 2>/dev/null
 
-echo "$as_me:12453: checking for socket in -lbsd" >&5
+echo "$as_me:12321: 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
@@ -12458,7 +12326,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12461 "configure"
+#line 12329 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12477,16 +12345,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12480: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12348: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12483: \$? = $ac_status" >&5
+  echo "$as_me:12351: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12486: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12489: \$? = $ac_status" >&5
+  echo "$as_me:12357: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_socket=yes
 else
@@ -12497,7 +12365,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12500: result: $ac_cv_lib_bsd_socket" >&5
+echo "$as_me:12368: 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
 
@@ -12526,13 +12394,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12529: checking for $ac_func" >&5
+echo "$as_me:12397: 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 12535 "configure"
+#line 12403 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12563,16 +12431,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12566: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12434: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12569: \$? = $ac_status" >&5
+  echo "$as_me:12437: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12575: \$? = $ac_status" >&5
+  echo "$as_me:12443: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12582,7 +12450,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12585: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12453: 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
@@ -12591,7 +12459,7 @@ EOF
 
 else
 
-echo "$as_me:12594: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:12462: 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
@@ -12599,7 +12467,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12602 "configure"
+#line 12470 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12618,16 +12486,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12621: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12489: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12624: \$? = $ac_status" >&5
+  echo "$as_me:12492: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12630: \$? = $ac_status" >&5
+  echo "$as_me:12498: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -12638,7 +12506,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12641: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:12509: 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
 
@@ -12663,13 +12531,13 @@ done
 for ac_func in inet_ntoa
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12666: checking for $ac_func" >&5
+echo "$as_me:12534: 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 12672 "configure"
+#line 12540 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12700,16 +12568,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12571: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12706: \$? = $ac_status" >&5
+  echo "$as_me:12574: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12712: \$? = $ac_status" >&5
+  echo "$as_me:12580: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12719,7 +12587,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12722: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12590: 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
@@ -12728,7 +12596,7 @@ EOF
 
 else
 
-echo "$as_me:12731: checking for inet_ntoa in -lnsl" >&5
+echo "$as_me:12599: checking for inet_ntoa in -lnsl" >&5
 echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12736,7 +12604,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12739 "configure"
+#line 12607 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12755,16 +12623,16 @@ inet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12758: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12761: \$? = $ac_status" >&5
+  echo "$as_me:12629: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12767: \$? = $ac_status" >&5
+  echo "$as_me:12635: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_inet_ntoa=yes
 else
@@ -12775,7 +12643,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12778: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+echo "$as_me:12646: result: $ac_cv_lib_nsl_inet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
 if test $ac_cv_lib_nsl_inet_ntoa = yes; then
 
@@ -12800,13 +12668,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12803: checking for $ac_func" >&5
+echo "$as_me:12671: 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 12809 "configure"
+#line 12677 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12837,16 +12705,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12840: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12708: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12843: \$? = $ac_status" >&5
+  echo "$as_me:12711: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12849: \$? = $ac_status" >&5
+  echo "$as_me:12717: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12856,7 +12724,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12859: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12727: 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
@@ -12865,7 +12733,7 @@ EOF
 
 else
 
-echo "$as_me:12868: checking for gethostbyname in -lnetwork" >&5
+echo "$as_me:12736: checking for gethostbyname in -lnetwork" >&5
 echo $ECHO_N "checking for gethostbyname in -lnetwork... $ECHO_C" >&6
 if test "${ac_cv_lib_network_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12873,7 +12741,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12876 "configure"
+#line 12744 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12892,16 +12760,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12895: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12763: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12898: \$? = $ac_status" >&5
+  echo "$as_me:12766: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12901: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12769: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12904: \$? = $ac_status" >&5
+  echo "$as_me:12772: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_network_gethostbyname=yes
 else
@@ -12912,7 +12780,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12915: result: $ac_cv_lib_network_gethostbyname" >&5
+echo "$as_me:12783: result: $ac_cv_lib_network_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_network_gethostbyname" >&6
 if test $ac_cv_lib_network_gethostbyname = yes; then
 
@@ -12937,13 +12805,13 @@ done
 for ac_func in strcasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12940: checking for $ac_func" >&5
+echo "$as_me:12808: 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 12946 "configure"
+#line 12814 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12974,16 +12842,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12977: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12845: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12980: \$? = $ac_status" >&5
+  echo "$as_me:12848: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12986: \$? = $ac_status" >&5
+  echo "$as_me:12854: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12993,7 +12861,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12996: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12864: 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
@@ -13002,7 +12870,7 @@ EOF
 
 else
 
-echo "$as_me:13005: checking for strcasecmp in -lresolv" >&5
+echo "$as_me:12873: 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
@@ -13010,7 +12878,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13013 "configure"
+#line 12881 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13029,16 +12897,16 @@ strcasecmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13032: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12900: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13035: \$? = $ac_status" >&5
+  echo "$as_me:12903: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13041: \$? = $ac_status" >&5
+  echo "$as_me:12909: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -13049,7 +12917,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13052: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:12920: 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
 
@@ -13106,14 +12974,14 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6
 
 fi
 
-echo "$as_me:13109: checking for inet_aton function" >&5
+echo "$as_me:12977: 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 13116 "configure"
+#line 12984 "configure"
 #include "confdefs.h"
 
 #if defined(__MINGW32__)
@@ -13148,16 +13016,16 @@ inet_aton(0, (struct in_addr *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13151: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13154: \$? = $ac_status" >&5
+  echo "$as_me:13022: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13160: \$? = $ac_status" >&5
+  echo "$as_me:13028: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_aton=yes
 else
@@ -13167,7 +13035,7 @@ cf_cv_have_inet_aton=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13170: result: $cf_cv_have_inet_aton" >&5
+echo "$as_me:13038: 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
 
@@ -13176,14 +13044,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-    echo "$as_me:13179: checking for inet_addr function" >&5
+    echo "$as_me:13047: 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 13186 "configure"
+#line 13054 "configure"
 #include "confdefs.h"
 
 #if defined(__MINGW32__)
@@ -13218,16 +13086,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13221: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13089: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13224: \$? = $ac_status" >&5
+  echo "$as_me:13092: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13230: \$? = $ac_status" >&5
+  echo "$as_me:13098: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_addr=yes
 else
@@ -13237,10 +13105,10 @@ cf_cv_have_inet_addr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13240: result: $cf_cv_have_inet_addr" >&5
+echo "$as_me:13108: 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:13243: checking for library with inet_addr" >&5
+	echo "$as_me:13111: 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
@@ -13251,7 +13119,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13254 "configure"
+#line 13122 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -13267,16 +13135,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13270: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13138: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13273: \$? = $ac_status" >&5
+  echo "$as_me:13141: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13279: \$? = $ac_status" >&5
+  echo "$as_me:13147: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -13290,7 +13158,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	    done
 
 fi
-echo "$as_me:13293: result: $cf_cv_lib_inet_addr" >&5
+echo "$as_me:13161: 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
 
@@ -13311,13 +13179,13 @@ done
 LIBS="$cf_add_libs"
 
 	else
-	    { echo "$as_me:13314: WARNING: Unable to find library for inet_addr function" >&5
+	    { echo "$as_me:13182: 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
 fi
 
-echo "$as_me:13320: checking if you want to use pkg-config" >&5
+echo "$as_me:13188: checking if you want to use pkg-config" >&5
 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
 
 # Check whether --with-pkg-config or --without-pkg-config was given.
@@ -13327,7 +13195,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:13330: result: $cf_pkg_config" >&5
+echo "$as_me:13198: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case $cf_pkg_config in #(vi
@@ -13339,7 +13207,7 @@ yes) #(vi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:13342: checking for $ac_word" >&5
+echo "$as_me:13210: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13356,7 +13224,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_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:13359: found $ac_dir/$ac_word" >&5
+   echo "$as_me:13227: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -13367,10 +13235,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:13370: result: $PKG_CONFIG" >&5
+  echo "$as_me:13238: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:13373: result: no" >&5
+  echo "$as_me:13241: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13379,7 +13247,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:13382: checking for $ac_word" >&5
+echo "$as_me:13250: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13396,7 +13264,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_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:13399: found $ac_dir/$ac_word" >&5
+   echo "$as_me:13267: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -13408,10 +13276,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:13411: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:13279: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:13414: result: no" >&5
+  echo "$as_me:13282: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13454,7 +13322,7 @@ case ".$PKG_CONFIG" in #(vi
   PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:13457: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+  { { echo "$as_me:13325: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -13503,7 +13371,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13506 "configure"
+#line 13374 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13515,16 +13383,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13518: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13386: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13521: \$? = $ac_status" >&5
+  echo "$as_me:13389: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13524: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13527: \$? = $ac_status" >&5
+  echo "$as_me:13395: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13541,7 +13409,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13544: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13412: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13582,7 +13450,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13585 "configure"
+#line 13453 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13594,16 +13462,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13597: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13465: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13600: \$? = $ac_status" >&5
+  echo "$as_me:13468: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13603: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13606: \$? = $ac_status" >&5
+  echo "$as_me:13474: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13620,7 +13488,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13623: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13491: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13636,7 +13504,7 @@ echo "${as_me:-configure}:13623: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:13639: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:13507: 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
@@ -13661,7 +13529,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13664: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13532: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13690,7 +13558,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13693: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13561: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13699,7 +13567,7 @@ echo "${as_me:-configure}:13693: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:13702: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:13570: 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
@@ -13716,15 +13584,15 @@ done
 			cf_cv_pkg_ssl=
 			for cf_try_package in openssl libssl
 			do
-				echo "$as_me:13719: checking pkg-config for $cf_try_package" >&5
+				echo "$as_me:13587: checking pkg-config for $cf_try_package" >&5
 echo $ECHO_N "checking pkg-config for $cf_try_package... $ECHO_C" >&6
 				if "$PKG_CONFIG" --exists $cf_try_package ; then
 					cf_cv_pkg_ssl=$cf_try_package
-					echo "$as_me:13723: result: yes" >&5
+					echo "$as_me:13591: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 					break
 				else
-					echo "$as_me:13727: result: no" >&5
+					echo "$as_me:13595: result: no" >&5
 echo "${ECHO_T}no" >&6
 				fi
 			done
@@ -13848,7 +13716,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:13851: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:13719: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$cf_libs_ssl"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -13884,7 +13752,7 @@ LIBS="$cf_add_libs"
 			*-ldl) #(vi
 				;;
 			*)
-				echo "$as_me:13887: checking for dlsym in -ldl" >&5
+				echo "$as_me:13755: checking for dlsym in -ldl" >&5
 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
 if test "${ac_cv_lib_dl_dlsym+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13892,7 +13760,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13895 "configure"
+#line 13763 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13911,16 +13779,16 @@ dlsym ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13914: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13782: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13917: \$? = $ac_status" >&5
+  echo "$as_me:13785: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13788: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13923: \$? = $ac_status" >&5
+  echo "$as_me:13791: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -13931,7 +13799,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13934: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:13802: result: $ac_cv_lib_dl_dlsym" >&5
 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
 if test $ac_cv_lib_dl_dlsym = yes; then
   cf_extra_ssl_libs="$cf_extra_ssl_libs -ldl"
@@ -13947,12 +13815,12 @@ fi
 cf_cv_header_path_ssl=
 cf_cv_library_path_ssl=
 
-echo "${as_me:-configure}:13950: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:13818: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 13955 "configure"
+#line 13823 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13981,16 +13849,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13984: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13852: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13987: \$? = $ac_status" >&5
+  echo "$as_me:13855: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13993: \$? = $ac_status" >&5
+  echo "$as_me:13861: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -14004,7 +13872,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14007 "configure"
+#line 13875 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14033,16 +13901,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14036: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13904: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14039: \$? = $ac_status" >&5
+  echo "$as_me:13907: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13910: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14045: \$? = $ac_status" >&5
+  echo "$as_me:13913: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -14059,9 +13927,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for ssl library" 1>&6
 
-echo "${as_me:-configure}:14062: testing find linkage for ssl library ..." 1>&5
+echo "${as_me:-configure}:13930: testing find linkage for ssl library ..." 1>&5
 
-echo "${as_me:-configure}:14064: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:13932: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14098,17 +13966,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/openssl &&       cf_search="$cf_search /usr/include/openssl"
-	test -d /usr/include/openssl/include &&    cf_search="$cf_search /usr/include/openssl/include"
-	test -d /usr/openssl/include &&       cf_search="$cf_search /usr/openssl/include"
-	test -d /usr/openssl/include/openssl &&    cf_search="$cf_search /usr/openssl/include/openssl"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -14120,38 +13977,27 @@ test -d "$prefix" && \
 	test -d $prefix/openssl/include/openssl &&    cf_search="$cf_search $prefix/openssl/include/openssl"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/openssl &&       cf_search="$cf_search /usr/local/include/openssl"
-	test -d /usr/local/include/openssl/include &&    cf_search="$cf_search /usr/local/include/openssl/include"
-	test -d /usr/local/openssl/include &&       cf_search="$cf_search /usr/local/openssl/include"
-	test -d /usr/local/openssl/include/openssl &&    cf_search="$cf_search /usr/local/openssl/include/openssl"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/openssl &&       cf_search="$cf_search /opt/include/openssl"
-	test -d /opt/include/openssl/include &&    cf_search="$cf_search /opt/include/openssl/include"
-	test -d /opt/openssl/include &&       cf_search="$cf_search /opt/openssl/include"
-	test -d /opt/openssl/include/openssl &&    cf_search="$cf_search /opt/openssl/include/openssl"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/openssl &&       cf_search="$cf_search $cf_subdir_prefix/include/openssl"
+	test -d $cf_subdir_prefix/include/openssl/include &&    cf_search="$cf_search $cf_subdir_prefix/include/openssl/include"
+	test -d $cf_subdir_prefix/openssl/include &&       cf_search="$cf_search $cf_subdir_prefix/openssl/include"
+	test -d $cf_subdir_prefix/openssl/include/openssl &&    cf_search="$cf_search $cf_subdir_prefix/openssl/include/openssl"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/openssl &&       cf_search="$cf_search $HOME/include/openssl"
-	test -d $HOME/include/openssl/include &&    cf_search="$cf_search $HOME/include/openssl/include"
-	test -d $HOME/openssl/include &&       cf_search="$cf_search $HOME/openssl/include"
-	test -d $HOME/openssl/include/openssl &&    cf_search="$cf_search $HOME/openssl/include/openssl"
-}
+done
 
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
@@ -14174,11 +14020,11 @@ cf_search="$cf_search $cf_header_path_list"
       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}:14177: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14023: 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 14181 "configure"
+#line 14027 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14207,21 +14053,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14210: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14056: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14213: \$? = $ac_status" >&5
+  echo "$as_me:14059: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14216: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14219: \$? = $ac_status" >&5
+  echo "$as_me:14065: \$? = $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}:14224: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14070: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
             cf_cv_find_linkage_ssl=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14239,7 +14085,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
-echo "${as_me:-configure}:14242: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:14088: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -14247,7 +14093,7 @@ echo "${as_me:-configure}:14242: testing Searching for ssl library in FIND_LINKA
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 14250 "configure"
+#line 14096 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14276,21 +14122,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14279: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14125: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14282: \$? = $ac_status" >&5
+  echo "$as_me:14128: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14131: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14288: \$? = $ac_status" >&5
+  echo "$as_me:14134: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
-echo "${as_me:-configure}:14293: testing ... found ssl library in system ..." 1>&5
+echo "${as_me:-configure}:14139: testing ... found ssl library in system ..." 1>&5
 
             cf_cv_find_linkage_ssl=yes
 else
@@ -14331,17 +14177,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/ssl &&       cf_search="$cf_search /usr/lib/ssl"
-	test -d /usr/lib/ssl/lib &&    cf_search="$cf_search /usr/lib/ssl/lib"
-	test -d /usr/ssl/lib &&       cf_search="$cf_search /usr/ssl/lib"
-	test -d /usr/ssl/lib/ssl &&    cf_search="$cf_search /usr/ssl/lib/ssl"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -14353,38 +14188,27 @@ test -d "$prefix" && \
 	test -d $prefix/ssl/lib/ssl &&    cf_search="$cf_search $prefix/ssl/lib/ssl"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/ssl &&       cf_search="$cf_search /usr/local/lib/ssl"
-	test -d /usr/local/lib/ssl/lib &&    cf_search="$cf_search /usr/local/lib/ssl/lib"
-	test -d /usr/local/ssl/lib &&       cf_search="$cf_search /usr/local/ssl/lib"
-	test -d /usr/local/ssl/lib/ssl &&    cf_search="$cf_search /usr/local/ssl/lib/ssl"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/ssl &&       cf_search="$cf_search /opt/lib/ssl"
-	test -d /opt/lib/ssl/lib &&    cf_search="$cf_search /opt/lib/ssl/lib"
-	test -d /opt/ssl/lib &&       cf_search="$cf_search /opt/ssl/lib"
-	test -d /opt/ssl/lib/ssl &&    cf_search="$cf_search /opt/ssl/lib/ssl"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/ssl &&       cf_search="$cf_search $cf_subdir_prefix/lib/ssl"
+	test -d $cf_subdir_prefix/lib/ssl/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/ssl/lib"
+	test -d $cf_subdir_prefix/ssl/lib &&       cf_search="$cf_search $cf_subdir_prefix/ssl/lib"
+	test -d $cf_subdir_prefix/ssl/lib/ssl &&    cf_search="$cf_search $cf_subdir_prefix/ssl/lib/ssl"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/ssl &&       cf_search="$cf_search $HOME/lib/ssl"
-	test -d $HOME/lib/ssl/lib &&    cf_search="$cf_search $HOME/lib/ssl/lib"
-	test -d $HOME/ssl/lib &&       cf_search="$cf_search $HOME/ssl/lib"
-	test -d $HOME/ssl/lib/ssl &&    cf_search="$cf_search $HOME/ssl/lib/ssl"
-}
+done
 
 cf_search="$cf_library_path_list $cf_search"
 
@@ -14393,13 +14217,13 @@ cf_search="$cf_library_path_list $cf_search"
           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}:14396: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14220: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_ssl"
             cat >conftest.$ac_ext <<_ACEOF
-#line 14402 "configure"
+#line 14226 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14428,21 +14252,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14431: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14255: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14434: \$? = $ac_status" >&5
+  echo "$as_me:14258: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14440: \$? = $ac_status" >&5
+  echo "$as_me:14264: \$? = $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}:14445: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14269: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
                 cf_cv_find_linkage_ssl=yes
                 cf_cv_library_file_ssl="-lssl"
@@ -14504,7 +14328,7 @@ if test -n "$cf_cv_library_path_ssl" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:14507: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14331: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -14560,7 +14384,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 14563 "configure"
+#line 14387 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14572,16 +14396,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14575: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14399: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14578: \$? = $ac_status" >&5
+  echo "$as_me:14402: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14584: \$? = $ac_status" >&5
+  echo "$as_me:14408: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14598,7 +14422,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:14601: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14425: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14629,7 +14453,7 @@ EOF
 		if test -n "$cf_cv_header_path_ssl" ; then
 			test -n "$verbose" && echo "	checking ssl header-path $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me:-configure}:14632: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14456: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
 
 			case $cf_cv_header_path_ssl in #(vi
 			*/openssl)
@@ -14642,10 +14466,10 @@ EOF
 			esac
 		fi
 
-echo "$as_me:14645: checking for X509 support" >&5
+echo "$as_me:14469: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 14648 "configure"
+#line 14472 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14674,16 +14498,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:14677: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14680: \$? = $ac_status" >&5
+  echo "$as_me:14504: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14686: \$? = $ac_status" >&5
+  echo "$as_me:14510: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -14692,7 +14516,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:14695: result: $cf_x509_support" >&5
+echo "$as_me:14519: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -14744,7 +14568,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14747 "configure"
+#line 14571 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14756,16 +14580,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14759: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14583: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14762: \$? = $ac_status" >&5
+  echo "$as_me:14586: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14768: \$? = $ac_status" >&5
+  echo "$as_me:14592: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14782,7 +14606,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:14785: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14609: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14823,7 +14647,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14826 "configure"
+#line 14650 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14835,16 +14659,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14838: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14662: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14841: \$? = $ac_status" >&5
+  echo "$as_me:14665: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14847: \$? = $ac_status" >&5
+  echo "$as_me:14671: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14861,7 +14685,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:14864: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14688: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14877,7 +14701,7 @@ echo "${as_me:-configure}:14864: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:14880: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:14704: 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
@@ -14902,7 +14726,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:14905: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14729: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -14931,7 +14755,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:14934: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14758: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -14940,7 +14764,7 @@ echo "${as_me:-configure}:14934: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:14943: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:14767: 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
@@ -14958,12 +14782,12 @@ done
 		yes) # if no explicit directory given, try pkg-config
 			test -n "$verbose" && echo "	checking pkg-config for $cf_pkg_gnutls" 1>&6
 
-echo "${as_me:-configure}:14961: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:14785: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
 
 			if "$PKG_CONFIG" --exists $cf_pkg_gnutls ; then
 				test -n "$verbose" && echo "	... found $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:14966: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:14790: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -15075,7 +14899,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:15078: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:14902: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$cf_libs_ssl"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -15097,7 +14921,7 @@ LIBS="$cf_add_libs"
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:15100: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:14924: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -15117,12 +14941,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:15120: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:14944: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15125 "configure"
+#line 14949 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15151,16 +14975,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15154: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14978: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15157: \$? = $ac_status" >&5
+  echo "$as_me:14981: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15160: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15163: \$? = $ac_status" >&5
+  echo "$as_me:14987: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -15174,7 +14998,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lgnutls  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15177 "configure"
+#line 15001 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15203,16 +15027,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15206: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15030: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15209: \$? = $ac_status" >&5
+  echo "$as_me:15033: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15212: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15215: \$? = $ac_status" >&5
+  echo "$as_me:15039: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -15229,9 +15053,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:15232: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:15056: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:15234: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15058: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15268,17 +15092,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/gnutls &&       cf_search="$cf_search /usr/include/gnutls"
-	test -d /usr/include/gnutls/include &&    cf_search="$cf_search /usr/include/gnutls/include"
-	test -d /usr/gnutls/include &&       cf_search="$cf_search /usr/gnutls/include"
-	test -d /usr/gnutls/include/gnutls &&    cf_search="$cf_search /usr/gnutls/include/gnutls"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -15290,38 +15103,27 @@ test -d "$prefix" && \
 	test -d $prefix/gnutls/include/gnutls &&    cf_search="$cf_search $prefix/gnutls/include/gnutls"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/gnutls &&       cf_search="$cf_search /usr/local/include/gnutls"
-	test -d /usr/local/include/gnutls/include &&    cf_search="$cf_search /usr/local/include/gnutls/include"
-	test -d /usr/local/gnutls/include &&       cf_search="$cf_search /usr/local/gnutls/include"
-	test -d /usr/local/gnutls/include/gnutls &&    cf_search="$cf_search /usr/local/gnutls/include/gnutls"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/gnutls &&       cf_search="$cf_search /opt/include/gnutls"
-	test -d /opt/include/gnutls/include &&    cf_search="$cf_search /opt/include/gnutls/include"
-	test -d /opt/gnutls/include &&       cf_search="$cf_search /opt/gnutls/include"
-	test -d /opt/gnutls/include/gnutls &&    cf_search="$cf_search /opt/gnutls/include/gnutls"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/gnutls &&       cf_search="$cf_search $cf_subdir_prefix/include/gnutls"
+	test -d $cf_subdir_prefix/include/gnutls/include &&    cf_search="$cf_search $cf_subdir_prefix/include/gnutls/include"
+	test -d $cf_subdir_prefix/gnutls/include &&       cf_search="$cf_search $cf_subdir_prefix/gnutls/include"
+	test -d $cf_subdir_prefix/gnutls/include/gnutls &&    cf_search="$cf_search $cf_subdir_prefix/gnutls/include/gnutls"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/gnutls &&       cf_search="$cf_search $HOME/include/gnutls"
-	test -d $HOME/include/gnutls/include &&    cf_search="$cf_search $HOME/include/gnutls/include"
-	test -d $HOME/gnutls/include &&       cf_search="$cf_search $HOME/gnutls/include"
-	test -d $HOME/gnutls/include/gnutls &&    cf_search="$cf_search $HOME/gnutls/include/gnutls"
-}
+done
 
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
@@ -15344,11 +15146,11 @@ cf_search="$cf_search $cf_header_path_list"
       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}:15347: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15149: 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 15351 "configure"
+#line 15153 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15377,21 +15179,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15380: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15383: \$? = $ac_status" >&5
+  echo "$as_me:15185: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15389: \$? = $ac_status" >&5
+  echo "$as_me:15191: \$? = $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}:15394: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15196: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
             cf_cv_find_linkage_gnutls=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15409,7 +15211,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:15412: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15214: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -15444,17 +15246,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/gnutls &&       cf_search="$cf_search /usr/lib/gnutls"
-	test -d /usr/lib/gnutls/lib &&    cf_search="$cf_search /usr/lib/gnutls/lib"
-	test -d /usr/gnutls/lib &&       cf_search="$cf_search /usr/gnutls/lib"
-	test -d /usr/gnutls/lib/gnutls &&    cf_search="$cf_search /usr/gnutls/lib/gnutls"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -15466,38 +15257,27 @@ test -d "$prefix" && \
 	test -d $prefix/gnutls/lib/gnutls &&    cf_search="$cf_search $prefix/gnutls/lib/gnutls"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/gnutls &&       cf_search="$cf_search /usr/local/lib/gnutls"
-	test -d /usr/local/lib/gnutls/lib &&    cf_search="$cf_search /usr/local/lib/gnutls/lib"
-	test -d /usr/local/gnutls/lib &&       cf_search="$cf_search /usr/local/gnutls/lib"
-	test -d /usr/local/gnutls/lib/gnutls &&    cf_search="$cf_search /usr/local/gnutls/lib/gnutls"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/gnutls &&       cf_search="$cf_search /opt/lib/gnutls"
-	test -d /opt/lib/gnutls/lib &&    cf_search="$cf_search /opt/lib/gnutls/lib"
-	test -d /opt/gnutls/lib &&       cf_search="$cf_search /opt/gnutls/lib"
-	test -d /opt/gnutls/lib/gnutls &&    cf_search="$cf_search /opt/gnutls/lib/gnutls"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/gnutls &&       cf_search="$cf_search $cf_subdir_prefix/lib/gnutls"
+	test -d $cf_subdir_prefix/lib/gnutls/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/gnutls/lib"
+	test -d $cf_subdir_prefix/gnutls/lib &&       cf_search="$cf_search $cf_subdir_prefix/gnutls/lib"
+	test -d $cf_subdir_prefix/gnutls/lib/gnutls &&    cf_search="$cf_search $cf_subdir_prefix/gnutls/lib/gnutls"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/gnutls &&       cf_search="$cf_search $HOME/lib/gnutls"
-	test -d $HOME/lib/gnutls/lib &&    cf_search="$cf_search $HOME/lib/gnutls/lib"
-	test -d $HOME/gnutls/lib &&       cf_search="$cf_search $HOME/gnutls/lib"
-	test -d $HOME/gnutls/lib/gnutls &&    cf_search="$cf_search $HOME/gnutls/lib/gnutls"
-}
+done
 
 cf_search="$cf_library_path_list $cf_search"
 
@@ -15506,13 +15286,13 @@ cf_search="$cf_library_path_list $cf_search"
           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}:15509: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15289: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lgnutls  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
             cat >conftest.$ac_ext <<_ACEOF
-#line 15515 "configure"
+#line 15295 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15541,21 +15321,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15544: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15324: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15547: \$? = $ac_status" >&5
+  echo "$as_me:15327: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15553: \$? = $ac_status" >&5
+  echo "$as_me:15333: \$? = $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}:15558: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15338: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
                 cf_cv_find_linkage_gnutls=yes
                 cf_cv_library_file_gnutls="-lgnutls"
@@ -15632,7 +15412,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 15635 "configure"
+#line 15415 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15644,16 +15424,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15647: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15427: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15650: \$? = $ac_status" >&5
+  echo "$as_me:15430: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15656: \$? = $ac_status" >&5
+  echo "$as_me:15436: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15670,7 +15450,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:15673: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15453: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15709,7 +15489,7 @@ if test -n "$cf_cv_library_path_gnutls" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:15712: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15492: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -15735,13 +15515,13 @@ do
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:15738: checking for gnutls_rnd" >&5
+		echo "$as_me:15518: checking for gnutls_rnd" >&5
 echo $ECHO_N "checking for gnutls_rnd... $ECHO_C" >&6
 if test "${ac_cv_func_gnutls_rnd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15744 "configure"
+#line 15524 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gnutls_rnd (); below.  */
@@ -15772,16 +15552,16 @@ f = gnutls_rnd; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15775: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15555: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15778: \$? = $ac_status" >&5
+  echo "$as_me:15558: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15784: \$? = $ac_status" >&5
+  echo "$as_me:15564: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -15791,7 +15571,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15794: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:15574: result: $ac_cv_func_gnutls_rnd" >&5
 echo "${ECHO_T}$ac_cv_func_gnutls_rnd" >&6
 if test $ac_cv_func_gnutls_rnd = yes; then
   cat >>confdefs.h <<\EOF
@@ -15820,10 +15600,10 @@ fi
 
 		EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o"
 
-echo "$as_me:15823: checking for X509 support" >&5
+echo "$as_me:15603: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 15826 "configure"
+#line 15606 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15852,16 +15632,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:15855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15635: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15858: \$? = $ac_status" >&5
+  echo "$as_me:15638: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15641: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15864: \$? = $ac_status" >&5
+  echo "$as_me:15644: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -15870,7 +15650,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:15873: result: $cf_x509_support" >&5
+echo "$as_me:15653: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -15885,13 +15665,13 @@ fi
 for ac_func in gnutls_priority_set_direct
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15888: checking for $ac_func" >&5
+echo "$as_me:15668: 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 15894 "configure"
+#line 15674 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -15922,16 +15702,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15925: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15705: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15928: \$? = $ac_status" >&5
+  echo "$as_me:15708: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15934: \$? = $ac_status" >&5
+  echo "$as_me:15714: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15941,7 +15721,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15944: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:15724: 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
@@ -15990,7 +15770,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15993 "configure"
+#line 15773 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16002,16 +15782,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16005: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15785: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16008: \$? = $ac_status" >&5
+  echo "$as_me:15788: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16014: \$? = $ac_status" >&5
+  echo "$as_me:15794: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16028,7 +15808,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:16031: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15811: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16069,7 +15849,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 16072 "configure"
+#line 15852 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16081,16 +15861,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16084: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15864: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16087: \$? = $ac_status" >&5
+  echo "$as_me:15867: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16090: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16093: \$? = $ac_status" >&5
+  echo "$as_me:15873: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16107,7 +15887,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:16110: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15890: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16123,7 +15903,7 @@ echo "${as_me:-configure}:16110: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:16126: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:15906: 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
@@ -16148,7 +15928,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:16151: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15931: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -16177,7 +15957,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:16180: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15960: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -16186,7 +15966,7 @@ echo "${as_me:-configure}:16180: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:16189: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:15969: 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
@@ -16204,12 +15984,12 @@ done
 		yes) # if no explicit directory given, try pkg-config
 			test -n "$verbose" && echo "	checking pkg-config for $cf_pkg_gnutls" 1>&6
 
-echo "${as_me:-configure}:16207: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:15987: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
 
 			if "$PKG_CONFIG" --exists $cf_pkg_gnutls ; then
 				test -n "$verbose" && echo "	... found $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:16212: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:15992: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -16321,7 +16101,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:16324: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:16104: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$cf_libs_ssl"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -16343,7 +16123,7 @@ LIBS="$cf_add_libs"
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:16346: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:16126: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -16363,12 +16143,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:16366: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16146: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 16371 "configure"
+#line 16151 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16397,16 +16177,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16400: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16403: \$? = $ac_status" >&5
+  echo "$as_me:16183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16409: \$? = $ac_status" >&5
+  echo "$as_me:16189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -16420,7 +16200,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 16423 "configure"
+#line 16203 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16449,16 +16229,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16452: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16232: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16455: \$? = $ac_status" >&5
+  echo "$as_me:16235: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16458: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16238: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16461: \$? = $ac_status" >&5
+  echo "$as_me:16241: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -16475,9 +16255,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:16478: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:16258: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:16480: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16260: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16514,17 +16294,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/gnutls &&       cf_search="$cf_search /usr/include/gnutls"
-	test -d /usr/include/gnutls/include &&    cf_search="$cf_search /usr/include/gnutls/include"
-	test -d /usr/gnutls/include &&       cf_search="$cf_search /usr/gnutls/include"
-	test -d /usr/gnutls/include/gnutls &&    cf_search="$cf_search /usr/gnutls/include/gnutls"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -16536,38 +16305,27 @@ test -d "$prefix" && \
 	test -d $prefix/gnutls/include/gnutls &&    cf_search="$cf_search $prefix/gnutls/include/gnutls"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/gnutls &&       cf_search="$cf_search /usr/local/include/gnutls"
-	test -d /usr/local/include/gnutls/include &&    cf_search="$cf_search /usr/local/include/gnutls/include"
-	test -d /usr/local/gnutls/include &&       cf_search="$cf_search /usr/local/gnutls/include"
-	test -d /usr/local/gnutls/include/gnutls &&    cf_search="$cf_search /usr/local/gnutls/include/gnutls"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/gnutls &&       cf_search="$cf_search /opt/include/gnutls"
-	test -d /opt/include/gnutls/include &&    cf_search="$cf_search /opt/include/gnutls/include"
-	test -d /opt/gnutls/include &&       cf_search="$cf_search /opt/gnutls/include"
-	test -d /opt/gnutls/include/gnutls &&    cf_search="$cf_search /opt/gnutls/include/gnutls"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/gnutls &&       cf_search="$cf_search $cf_subdir_prefix/include/gnutls"
+	test -d $cf_subdir_prefix/include/gnutls/include &&    cf_search="$cf_search $cf_subdir_prefix/include/gnutls/include"
+	test -d $cf_subdir_prefix/gnutls/include &&       cf_search="$cf_search $cf_subdir_prefix/gnutls/include"
+	test -d $cf_subdir_prefix/gnutls/include/gnutls &&    cf_search="$cf_search $cf_subdir_prefix/gnutls/include/gnutls"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/gnutls &&       cf_search="$cf_search $HOME/include/gnutls"
-	test -d $HOME/include/gnutls/include &&    cf_search="$cf_search $HOME/include/gnutls/include"
-	test -d $HOME/gnutls/include &&       cf_search="$cf_search $HOME/gnutls/include"
-	test -d $HOME/gnutls/include/gnutls &&    cf_search="$cf_search $HOME/gnutls/include/gnutls"
-}
+done
 
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
@@ -16590,11 +16348,11 @@ cf_search="$cf_search $cf_header_path_list"
       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}:16593: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16351: 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 16597 "configure"
+#line 16355 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16623,21 +16381,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16626: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16384: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16629: \$? = $ac_status" >&5
+  echo "$as_me:16387: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16635: \$? = $ac_status" >&5
+  echo "$as_me:16393: \$? = $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}:16640: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16398: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
             cf_cv_find_linkage_gnutls=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16655,7 +16413,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:16658: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16416: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -16690,17 +16448,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/gnutls &&       cf_search="$cf_search /usr/lib/gnutls"
-	test -d /usr/lib/gnutls/lib &&    cf_search="$cf_search /usr/lib/gnutls/lib"
-	test -d /usr/gnutls/lib &&       cf_search="$cf_search /usr/gnutls/lib"
-	test -d /usr/gnutls/lib/gnutls &&    cf_search="$cf_search /usr/gnutls/lib/gnutls"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -16712,38 +16459,27 @@ test -d "$prefix" && \
 	test -d $prefix/gnutls/lib/gnutls &&    cf_search="$cf_search $prefix/gnutls/lib/gnutls"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/gnutls &&       cf_search="$cf_search /usr/local/lib/gnutls"
-	test -d /usr/local/lib/gnutls/lib &&    cf_search="$cf_search /usr/local/lib/gnutls/lib"
-	test -d /usr/local/gnutls/lib &&       cf_search="$cf_search /usr/local/gnutls/lib"
-	test -d /usr/local/gnutls/lib/gnutls &&    cf_search="$cf_search /usr/local/gnutls/lib/gnutls"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/gnutls &&       cf_search="$cf_search /opt/lib/gnutls"
-	test -d /opt/lib/gnutls/lib &&    cf_search="$cf_search /opt/lib/gnutls/lib"
-	test -d /opt/gnutls/lib &&       cf_search="$cf_search /opt/gnutls/lib"
-	test -d /opt/gnutls/lib/gnutls &&    cf_search="$cf_search /opt/gnutls/lib/gnutls"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/gnutls &&       cf_search="$cf_search $cf_subdir_prefix/lib/gnutls"
+	test -d $cf_subdir_prefix/lib/gnutls/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/gnutls/lib"
+	test -d $cf_subdir_prefix/gnutls/lib &&       cf_search="$cf_search $cf_subdir_prefix/gnutls/lib"
+	test -d $cf_subdir_prefix/gnutls/lib/gnutls &&    cf_search="$cf_search $cf_subdir_prefix/gnutls/lib/gnutls"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/gnutls &&       cf_search="$cf_search $HOME/lib/gnutls"
-	test -d $HOME/lib/gnutls/lib &&    cf_search="$cf_search $HOME/lib/gnutls/lib"
-	test -d $HOME/gnutls/lib &&       cf_search="$cf_search $HOME/gnutls/lib"
-	test -d $HOME/gnutls/lib/gnutls &&    cf_search="$cf_search $HOME/gnutls/lib/gnutls"
-}
+done
 
 cf_search="$cf_library_path_list $cf_search"
 
@@ -16752,13 +16488,13 @@ cf_search="$cf_library_path_list $cf_search"
           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}:16755: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16491: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
             cat >conftest.$ac_ext <<_ACEOF
-#line 16761 "configure"
+#line 16497 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16787,21 +16523,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16790: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16526: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16793: \$? = $ac_status" >&5
+  echo "$as_me:16529: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16799: \$? = $ac_status" >&5
+  echo "$as_me:16535: \$? = $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}:16804: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16540: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
                 cf_cv_find_linkage_gnutls=yes
                 cf_cv_library_file_gnutls="-lgnutls"
@@ -16878,7 +16614,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 16881 "configure"
+#line 16617 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16890,16 +16626,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16893: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16629: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16896: \$? = $ac_status" >&5
+  echo "$as_me:16632: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16902: \$? = $ac_status" >&5
+  echo "$as_me:16638: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16916,7 +16652,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:16919: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16655: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16955,7 +16691,7 @@ if test -n "$cf_cv_library_path_gnutls" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:16958: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16694: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -16981,13 +16717,13 @@ do
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:16984: checking for gnutls_rnd" >&5
+		echo "$as_me:16720: checking for gnutls_rnd" >&5
 echo $ECHO_N "checking for gnutls_rnd... $ECHO_C" >&6
 if test "${ac_cv_func_gnutls_rnd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16990 "configure"
+#line 16726 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gnutls_rnd (); below.  */
@@ -17018,16 +16754,16 @@ f = gnutls_rnd; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17021: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16757: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17024: \$? = $ac_status" >&5
+  echo "$as_me:16760: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16763: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17030: \$? = $ac_status" >&5
+  echo "$as_me:16766: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -17037,7 +16773,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17040: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:16776: result: $ac_cv_func_gnutls_rnd" >&5
 echo "${ECHO_T}$ac_cv_func_gnutls_rnd" >&6
 if test $ac_cv_func_gnutls_rnd = yes; then
   cat >>confdefs.h <<\EOF
@@ -17065,7 +16801,7 @@ LIBS="$cf_add_libs"
 fi
 
 		if test "$cf_pkg_gnutls" = none ; then
-				echo "$as_me:17068: checking for SSL_connect in -lgnutls-openssl" >&5
+				echo "$as_me:16804: 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
@@ -17073,7 +16809,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17076 "configure"
+#line 16812 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17092,16 +16828,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17095: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16831: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17098: \$? = $ac_status" >&5
+  echo "$as_me:16834: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16837: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17104: \$? = $ac_status" >&5
+  echo "$as_me:16840: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -17112,7 +16848,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17115: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:16851: 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
 
@@ -17133,7 +16869,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:17136: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:16872: 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
@@ -17141,7 +16877,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17144 "configure"
+#line 16880 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17160,16 +16896,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17163: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16899: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17166: \$? = $ac_status" >&5
+  echo "$as_me:16902: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16905: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17172: \$? = $ac_status" >&5
+  echo "$as_me:16908: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -17180,7 +16916,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17183: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:16919: 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
 
@@ -17201,7 +16937,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:17204: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:16940: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17210,10 +16946,10 @@ fi
 
 			fi
 
-echo "$as_me:17213: checking for X509 support" >&5
+echo "$as_me:16949: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 17216 "configure"
+#line 16952 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17242,16 +16978,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:17245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16981: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17248: \$? = $ac_status" >&5
+  echo "$as_me:16984: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17254: \$? = $ac_status" >&5
+  echo "$as_me:16990: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -17260,7 +16996,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:17263: result: $cf_x509_support" >&5
+echo "$as_me:16999: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -17292,7 +17028,7 @@ no) #(vi
 	;;
 yes) #(vi
 
-echo "$as_me:17295: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:17031: 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
@@ -17300,7 +17036,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17303 "configure"
+#line 17039 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17319,16 +17055,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17325: \$? = $ac_status" >&5
+  echo "$as_me:17061: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17331: \$? = $ac_status" >&5
+  echo "$as_me:17067: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
 else
@@ -17339,7 +17075,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17342: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:17078: 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
@@ -17354,11 +17090,11 @@ else
 		if test -d $cf_ssl_root ; then
 			test -n "$verbose" && echo "	assume it is in $cf_ssl_root" 1>&6
 
-echo "${as_me:-configure}:17357: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me:-configure}:17093: 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:17361: error: cannot find NSS compilant libraries" >&5
+			{ { echo "$as_me:17097: error: cannot find NSS compilant libraries" >&5
 echo "$as_me: error: cannot find NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -17373,13 +17109,13 @@ fi
 		elif test -d $cf_cv_use_libnss_compat/../include ; then
 			cf_ssl_root=$cf_cv_use_libnss_compat/..
 		else
-			{ { echo "$as_me:17376: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
+			{ { echo "$as_me:17112: 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:17382: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+		{ echo "$as_me:17118: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
 	fi
 	;;
@@ -17488,10 +17224,10 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:17491: checking for NSS compilant include directory" >&5
+echo "$as_me:17227: 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 17494 "configure"
+#line 17230 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17505,16 +17241,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17508: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17244: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17511: \$? = $ac_status" >&5
+  echo "$as_me:17247: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17517: \$? = $ac_status" >&5
+  echo "$as_me:17253: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_incl=yes
 else
@@ -17523,7 +17259,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_incl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:17526: result: $cf_ssl_incl" >&5
+echo "$as_me:17262: result: $cf_ssl_incl" >&5
 echo "${ECHO_T}$cf_ssl_incl" >&6
 test "$cf_ssl_incl" = yes &&
 cat >>confdefs.h <<\EOF
@@ -17532,10 +17268,10 @@ EOF
 
 fi
 
-echo "$as_me:17535: checking if we can link to NSS compilant library" >&5
+echo "$as_me:17271: 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 17538 "configure"
+#line 17274 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17554,16 +17290,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17557: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17293: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17560: \$? = $ac_status" >&5
+  echo "$as_me:17296: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17566: \$? = $ac_status" >&5
+  echo "$as_me:17302: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_library=yes
 else
@@ -17572,7 +17308,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_library=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:17575: result: $cf_ssl_library" >&5
+echo "$as_me:17311: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 
@@ -17585,7 +17321,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ { echo "$as_me:17588: error: Cannot link with NSS compilant libraries" >&5
+	{ { echo "$as_me:17324: error: Cannot link with NSS compilant libraries" >&5
 echo "$as_me: error: Cannot link with NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17593,7 +17329,7 @@ fi
 fi
 
 ### check for ipv6 support
-echo "$as_me:17596: checking whether to enable ipv6" >&5
+echo "$as_me:17332: 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.
@@ -17610,11 +17346,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:17613: result: $enableval" >&5
+echo "$as_me:17349: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:17617: checking ipv6 stack type" >&5
+echo "$as_me:17353: 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
@@ -17635,7 +17371,7 @@ do
 		;;
 	inria) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17638 "configure"
+#line 17374 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -17652,7 +17388,7 @@ rm -rf conftest*
 		;;
 	kame) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17655 "configure"
+#line 17391 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -17669,7 +17405,7 @@ rm -rf conftest*
 		;;
 	linux-glibc) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17672 "configure"
+#line 17408 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -17695,7 +17431,7 @@ rm -rf conftest*
 		;;
 	toshiba) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17698 "configure"
+#line 17434 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -17712,7 +17448,7 @@ rm -rf conftest*
 		;;
 	v6d) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17715 "configure"
+#line 17451 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -17729,7 +17465,7 @@ rm -rf conftest*
 		;;
 	zeta)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17732 "configure"
+#line 17468 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -17751,13 +17487,13 @@ rm -rf conftest*
 done
 
 fi
-echo "$as_me:17754: result: $cf_cv_ipv6type" >&5
+echo "$as_me:17490: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:17760: checking for IPv6 library if required" >&5
+echo "$as_me:17496: 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
@@ -17787,13 +17523,13 @@ zeta)
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:17790: result: $cf_ipv6lib" >&5
+echo "$as_me:17526: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17796 "configure"
+#line 17532 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17809,16 +17545,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17548: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17815: \$? = $ac_status" >&5
+  echo "$as_me:17551: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17821: \$? = $ac_status" >&5
+  echo "$as_me:17557: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17857,17 +17593,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/$cf_ipv6dir &&       cf_search="$cf_search /usr/include/$cf_ipv6dir"
-	test -d /usr/include/$cf_ipv6dir/include &&    cf_search="$cf_search /usr/include/$cf_ipv6dir/include"
-	test -d /usr/$cf_ipv6dir/include &&       cf_search="$cf_search /usr/$cf_ipv6dir/include"
-	test -d /usr/$cf_ipv6dir/include/$cf_ipv6dir &&    cf_search="$cf_search /usr/$cf_ipv6dir/include/$cf_ipv6dir"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -17879,38 +17604,27 @@ test -d "$prefix" && \
 	test -d $prefix/$cf_ipv6dir/include/$cf_ipv6dir &&    cf_search="$cf_search $prefix/$cf_ipv6dir/include/$cf_ipv6dir"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/$cf_ipv6dir &&       cf_search="$cf_search /usr/local/include/$cf_ipv6dir"
-	test -d /usr/local/include/$cf_ipv6dir/include &&    cf_search="$cf_search /usr/local/include/$cf_ipv6dir/include"
-	test -d /usr/local/$cf_ipv6dir/include &&       cf_search="$cf_search /usr/local/$cf_ipv6dir/include"
-	test -d /usr/local/$cf_ipv6dir/include/$cf_ipv6dir &&    cf_search="$cf_search /usr/local/$cf_ipv6dir/include/$cf_ipv6dir"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/$cf_ipv6dir &&       cf_search="$cf_search /opt/include/$cf_ipv6dir"
-	test -d /opt/include/$cf_ipv6dir/include &&    cf_search="$cf_search /opt/include/$cf_ipv6dir/include"
-	test -d /opt/$cf_ipv6dir/include &&       cf_search="$cf_search /opt/$cf_ipv6dir/include"
-	test -d /opt/$cf_ipv6dir/include/$cf_ipv6dir &&    cf_search="$cf_search /opt/$cf_ipv6dir/include/$cf_ipv6dir"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/$cf_ipv6dir &&       cf_search="$cf_search $cf_subdir_prefix/include/$cf_ipv6dir"
+	test -d $cf_subdir_prefix/include/$cf_ipv6dir/include &&    cf_search="$cf_search $cf_subdir_prefix/include/$cf_ipv6dir/include"
+	test -d $cf_subdir_prefix/$cf_ipv6dir/include &&       cf_search="$cf_search $cf_subdir_prefix/$cf_ipv6dir/include"
+	test -d $cf_subdir_prefix/$cf_ipv6dir/include/$cf_ipv6dir &&    cf_search="$cf_search $cf_subdir_prefix/$cf_ipv6dir/include/$cf_ipv6dir"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/$cf_ipv6dir &&       cf_search="$cf_search $HOME/include/$cf_ipv6dir"
-	test -d $HOME/include/$cf_ipv6dir/include &&    cf_search="$cf_search $HOME/include/$cf_ipv6dir/include"
-	test -d $HOME/$cf_ipv6dir/include &&       cf_search="$cf_search $HOME/$cf_ipv6dir/include"
-	test -d $HOME/$cf_ipv6dir/include/$cf_ipv6dir &&    cf_search="$cf_search $HOME/$cf_ipv6dir/include/$cf_ipv6dir"
-}
+done
 
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
@@ -17958,7 +17672,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 17961 "configure"
+#line 17675 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17970,16 +17684,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17973: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17687: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17976: \$? = $ac_status" >&5
+  echo "$as_me:17690: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17982: \$? = $ac_status" >&5
+  echo "$as_me:17696: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17996,7 +17710,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:17999: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17713: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18022,13 +17736,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:18025: checking for getaddrinfo" >&5
+	echo "$as_me:17739: 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 18031 "configure"
+#line 17745 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo (); below.  */
@@ -18059,16 +17773,16 @@ f = getaddrinfo; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18062: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17776: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18065: \$? = $ac_status" >&5
+  echo "$as_me:17779: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18071: \$? = $ac_status" >&5
+  echo "$as_me:17785: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -18078,18 +17792,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18081: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:17795: 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:18088: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:17802: 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 18092 "configure"
+#line 17806 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -18105,25 +17819,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18108: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17822: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18111: \$? = $ac_status" >&5
+  echo "$as_me:17825: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18117: \$? = $ac_status" >&5
+  echo "$as_me:17831: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18119: result: yes" >&5
+  echo "$as_me:17833: 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:18126: result: no" >&5
+echo "$as_me:17840: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -18154,17 +17868,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/$cf_ipv6dir &&       cf_search="$cf_search /usr/lib/$cf_ipv6dir"
-	test -d /usr/lib/$cf_ipv6dir/lib &&    cf_search="$cf_search /usr/lib/$cf_ipv6dir/lib"
-	test -d /usr/$cf_ipv6dir/lib &&       cf_search="$cf_search /usr/$cf_ipv6dir/lib"
-	test -d /usr/$cf_ipv6dir/lib/$cf_ipv6dir &&    cf_search="$cf_search /usr/$cf_ipv6dir/lib/$cf_ipv6dir"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -18176,48 +17879,37 @@ test -d "$prefix" && \
 	test -d $prefix/$cf_ipv6dir/lib/$cf_ipv6dir &&    cf_search="$cf_search $prefix/$cf_ipv6dir/lib/$cf_ipv6dir"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/$cf_ipv6dir &&       cf_search="$cf_search /usr/local/lib/$cf_ipv6dir"
-	test -d /usr/local/lib/$cf_ipv6dir/lib &&    cf_search="$cf_search /usr/local/lib/$cf_ipv6dir/lib"
-	test -d /usr/local/$cf_ipv6dir/lib &&       cf_search="$cf_search /usr/local/$cf_ipv6dir/lib"
-	test -d /usr/local/$cf_ipv6dir/lib/$cf_ipv6dir &&    cf_search="$cf_search /usr/local/$cf_ipv6dir/lib/$cf_ipv6dir"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/$cf_ipv6dir &&       cf_search="$cf_search /opt/lib/$cf_ipv6dir"
-	test -d /opt/lib/$cf_ipv6dir/lib &&    cf_search="$cf_search /opt/lib/$cf_ipv6dir/lib"
-	test -d /opt/$cf_ipv6dir/lib &&       cf_search="$cf_search /opt/$cf_ipv6dir/lib"
-	test -d /opt/$cf_ipv6dir/lib/$cf_ipv6dir &&    cf_search="$cf_search /opt/$cf_ipv6dir/lib/$cf_ipv6dir"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/$cf_ipv6dir &&       cf_search="$cf_search $cf_subdir_prefix/lib/$cf_ipv6dir"
+	test -d $cf_subdir_prefix/lib/$cf_ipv6dir/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/$cf_ipv6dir/lib"
+	test -d $cf_subdir_prefix/$cf_ipv6dir/lib &&       cf_search="$cf_search $cf_subdir_prefix/$cf_ipv6dir/lib"
+	test -d $cf_subdir_prefix/$cf_ipv6dir/lib/$cf_ipv6dir &&    cf_search="$cf_search $cf_subdir_prefix/$cf_ipv6dir/lib/$cf_ipv6dir"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/$cf_ipv6dir &&       cf_search="$cf_search $HOME/lib/$cf_ipv6dir"
-	test -d $HOME/lib/$cf_ipv6dir/lib &&    cf_search="$cf_search $HOME/lib/$cf_ipv6dir/lib"
-	test -d $HOME/$cf_ipv6dir/lib &&       cf_search="$cf_search $HOME/$cf_ipv6dir/lib"
-	test -d $HOME/$cf_ipv6dir/lib/$cf_ipv6dir &&    cf_search="$cf_search $HOME/$cf_ipv6dir/lib/$cf_ipv6dir"
-}
+done
 
 cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:18216: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:17908: 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 18220 "configure"
+#line 17912 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -18233,25 +17925,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17928: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18239: \$? = $ac_status" >&5
+  echo "$as_me:17931: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18245: \$? = $ac_status" >&5
+  echo "$as_me:17937: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18247: result: yes" >&5
+  echo "$as_me:17939: 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:18254: result: no" >&5
+echo "$as_me:17946: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -18266,7 +17958,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib
 
 	if test $cf_found_library = no ; then
-		{ { echo "$as_me:18269: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:17961: 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;}
@@ -18274,7 +17966,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:18277: checking working getaddrinfo" >&5
+echo "$as_me:17969: 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
@@ -18284,7 +17976,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18287 "configure"
+#line 17979 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -18364,15 +18056,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18367: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18059: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18370: \$? = $ac_status" >&5
+  echo "$as_me:18062: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:18372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18375: \$? = $ac_status" >&5
+  echo "$as_me:18067: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -18385,7 +18077,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:18388: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:18080: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 
@@ -18401,12 +18093,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:18404: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:18096: 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:18409: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:18101: 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.
@@ -18417,7 +18109,7 @@ fi
 
 fi
 
-echo "$as_me:18420: checking for screen type" >&5
+echo "$as_me:18112: 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
@@ -18431,7 +18123,7 @@ case $withval in
 curses|ncurses|ncursesw|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-*)	{ { echo "$as_me:18434: error: Unexpected value" >&5
+*)	{ { echo "$as_me:18126: error: Unexpected value" >&5
 echo "$as_me: error: Unexpected value" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18440,13 +18132,13 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:18443: result: $cf_cv_screen" >&5
+echo "$as_me:18135: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 curses|ncurses*)
 
-echo "$as_me:18449: checking for specific curses-directory" >&5
+echo "$as_me:18141: checking for specific curses-directory" >&5
 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
 
 # Check whether --with-curses-dir or --without-curses-dir was given.
@@ -18456,7 +18148,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:18459: result: $cf_cv_curses_dir" >&5
+echo "$as_me:18151: result: $cf_cv_curses_dir" >&5
 echo "${ECHO_T}$cf_cv_curses_dir" >&6
 
 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
@@ -18487,7 +18179,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:18490: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:18182: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -18520,7 +18212,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18523 "configure"
+#line 18215 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18532,16 +18224,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18535: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18227: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18538: \$? = $ac_status" >&5
+  echo "$as_me:18230: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18541: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18544: \$? = $ac_status" >&5
+  echo "$as_me:18236: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18558,7 +18250,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:18561: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18253: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18592,7 +18284,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:18595: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18287: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -18611,7 +18303,7 @@ dft_color_style=yes
 case $cf_cv_screen in
 curses)
 
-echo "$as_me:18614: checking for extra include directories" >&5
+echo "$as_me:18306: 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
@@ -18637,11 +18329,11 @@ sunos3*|sunos4*)
 esac
 
 fi
-echo "$as_me:18640: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:18332: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
 
-echo "$as_me:18644: checking if we have identified curses headers" >&5
+echo "$as_me:18336: 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
@@ -18653,7 +18345,7 @@ for cf_header in  \
 	curses.h ncurses/ncurses.h ncurses/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18656 "configure"
+#line 18348 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -18665,16 +18357,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18668: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18360: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18671: \$? = $ac_status" >&5
+  echo "$as_me:18363: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18677: \$? = $ac_status" >&5
+  echo "$as_me:18369: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -18685,11 +18377,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:18688: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:18380: 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:18692: error: No curses header-files found" >&5
+	{ { echo "$as_me:18384: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -18699,23 +18391,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:18702: checking for $ac_header" >&5
+echo "$as_me:18394: 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 18708 "configure"
+#line 18400 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18712: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18404: \"$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:18718: \$? = $ac_status" >&5
+  echo "$as_me:18410: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18734,7 +18426,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:18737: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:18429: 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
@@ -18744,7 +18436,7 @@ EOF
 fi
 done
 
-echo "$as_me:18747: checking for terminfo header" >&5
+echo "$as_me:18439: 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
@@ -18762,7 +18454,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18765 "configure"
+#line 18457 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18777,16 +18469,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18780: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18472: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18783: \$? = $ac_status" >&5
+  echo "$as_me:18475: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18789: \$? = $ac_status" >&5
+  echo "$as_me:18481: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -18802,7 +18494,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:18805: result: $cf_cv_term_header" >&5
+echo "$as_me:18497: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -18834,7 +18526,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:18837: checking for ncurses version" >&5
+echo "$as_me:18529: 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
@@ -18860,10 +18552,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:18863: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:18555: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:18866: \$? = $ac_status" >&5
+  echo "$as_me:18558: \$? = $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%".*%%'`
@@ -18873,7 +18565,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18876 "configure"
+#line 18568 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18898,15 +18590,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18901: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18593: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18904: \$? = $ac_status" >&5
+  echo "$as_me:18596: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:18906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18909: \$? = $ac_status" >&5
+  echo "$as_me:18601: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -18920,17 +18612,17 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:18923: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:18615: 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:18930: checking if we have identified curses libraries" >&5
+echo "$as_me:18622: 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 18933 "configure"
+#line 18625 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -18942,16 +18634,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18637: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18948: \$? = $ac_status" >&5
+  echo "$as_me:18640: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18643: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18954: \$? = $ac_status" >&5
+  echo "$as_me:18646: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -18960,13 +18652,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:18963: result: $cf_result" >&5
+echo "$as_me:18655: 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:18969: checking for tgoto in -lmytinfo" >&5
+    echo "$as_me:18661: 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
@@ -18974,7 +18666,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18977 "configure"
+#line 18669 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18993,16 +18685,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18996: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18688: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18999: \$? = $ac_status" >&5
+  echo "$as_me:18691: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18694: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19005: \$? = $ac_status" >&5
+  echo "$as_me:18697: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -19013,7 +18705,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19016: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:18708: 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
 
@@ -19043,7 +18735,7 @@ hpux10.*) #(vi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:19046: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:18738: 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
@@ -19051,7 +18743,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19054 "configure"
+#line 18746 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19070,16 +18762,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19073: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18765: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19076: \$? = $ac_status" >&5
+  echo "$as_me:18768: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19082: \$? = $ac_status" >&5
+  echo "$as_me:18774: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -19090,7 +18782,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19093: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:18785: 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
 
@@ -19114,7 +18806,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19117: checking for initscr in -lHcurses" >&5
+		echo "$as_me:18809: 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
@@ -19122,7 +18814,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19125 "configure"
+#line 18817 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19141,16 +18833,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18836: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19147: \$? = $ac_status" >&5
+  echo "$as_me:18839: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18842: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19153: \$? = $ac_status" >&5
+  echo "$as_me:18845: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -19161,7 +18853,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19164: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:18856: 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
 
@@ -19217,7 +18909,7 @@ if test -n "/lib64" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:19220: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18912: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -19246,7 +18938,7 @@ if test -n "/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:19249: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18941: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -19277,7 +18969,7 @@ if test -n "/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:19280: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18972: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -19312,7 +19004,7 @@ if test -n "/usr/5lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:19315: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19007: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -19356,13 +19048,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 	# because it may be needed to link the test-case for initscr.
 	if test "x$cf_term_lib" = x
 	then
-		echo "$as_me:19359: checking for tgoto" >&5
+		echo "$as_me:19051: 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 19365 "configure"
+#line 19057 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -19393,16 +19085,16 @@ f = tgoto; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19396: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19088: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19399: \$? = $ac_status" >&5
+  echo "$as_me:19091: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19094: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19405: \$? = $ac_status" >&5
+  echo "$as_me:19097: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -19412,7 +19104,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19415: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:19107: 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
@@ -19421,7 +19113,7 @@ else
 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
 			do
 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:19424: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:19116: 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
@@ -19429,7 +19121,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19432 "configure"
+#line 19124 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19448,16 +19140,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19451: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19143: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19454: \$? = $ac_status" >&5
+  echo "$as_me:19146: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19457: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19460: \$? = $ac_status" >&5
+  echo "$as_me:19152: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19468,7 +19160,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19471: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:19163: 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
@@ -19487,7 +19179,7 @@ fi
 		for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
 		do
 			as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
-echo "$as_me:19490: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:19182: 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
@@ -19495,7 +19187,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19498 "configure"
+#line 19190 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19514,16 +19206,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19517: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19209: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19520: \$? = $ac_status" >&5
+  echo "$as_me:19212: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19215: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19526: \$? = $ac_status" >&5
+  echo "$as_me:19218: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19534,7 +19226,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19537: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:19229: 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
@@ -19542,16 +19234,16 @@ fi
 
 		done
 	fi
-	test $cf_curs_lib = unknown && { { echo "$as_me:19545: error: no curses library found" >&5
+	test $cf_curs_lib = unknown && { { echo "$as_me:19237: 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:19551: checking if we can link with $cf_curs_lib library" >&5
+		echo "$as_me:19243: 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 19554 "configure"
+#line 19246 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19563,16 +19255,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19566: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19258: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19569: \$? = $ac_status" >&5
+  echo "$as_me:19261: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19264: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19575: \$? = $ac_status" >&5
+  echo "$as_me:19267: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19581,18 +19273,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:19584: result: $cf_result" >&5
+		echo "$as_me:19276: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-		test $cf_result = no && { { echo "$as_me:19586: error: Cannot link curses library" >&5
+		test $cf_result = no && { { echo "$as_me:19278: 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:19592: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+		echo "$as_me:19284: 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 19595 "configure"
+#line 19287 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19604,16 +19296,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19607: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19299: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19610: \$? = $ac_status" >&5
+  echo "$as_me:19302: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19305: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19616: \$? = $ac_status" >&5
+  echo "$as_me:19308: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -19622,7 +19314,7 @@ cat conftest.$ac_ext >&5
 
 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 19625 "configure"
+#line 19317 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19634,16 +19326,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19637: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19329: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19640: \$? = $ac_status" >&5
+  echo "$as_me:19332: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19643: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19646: \$? = $ac_status" >&5
+  echo "$as_me:19338: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19655,13 +19347,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:19658: result: $cf_result" >&5
+		echo "$as_me:19350: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	fi
 fi
 fi
 
-echo "$as_me:19664: checking for curses performance tradeoff" >&5
+echo "$as_me:19356: 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
@@ -19669,7 +19361,7 @@ else
 
     cf_cv_curs_performance=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 19672 "configure"
+#line 19364 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19688,20 +19380,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19691: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19383: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19694: \$? = $ac_status" >&5
+  echo "$as_me:19386: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19389: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19700: \$? = $ac_status" >&5
+  echo "$as_me:19392: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19704 "configure"
+#line 19396 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -19721,16 +19413,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19724: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19416: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19727: \$? = $ac_status" >&5
+  echo "$as_me:19419: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19730: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19733: \$? = $ac_status" >&5
+  echo "$as_me:19425: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -19745,21 +19437,21 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:19748: result: $cf_cv_curs_performance" >&5
+echo "$as_me:19440: 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:19755: checking for curses touchline function" >&5
+echo "$as_me:19447: 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 19762 "configure"
+#line 19454 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19772,23 +19464,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19775: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19467: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19778: \$? = $ac_status" >&5
+  echo "$as_me:19470: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19784: \$? = $ac_status" >&5
+  echo "$as_me:19476: \$? = $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 19791 "configure"
+#line 19483 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19801,16 +19493,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19804: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19496: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19807: \$? = $ac_status" >&5
+  echo "$as_me:19499: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19502: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19813: \$? = $ac_status" >&5
+  echo "$as_me:19505: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -19822,7 +19514,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:19825: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:19517: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in #(vi
 bsd) #(vi
@@ -19853,7 +19545,7 @@ if test -n "$ac_tool_prefix"; 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:19856: checking for $ac_word" >&5
+echo "$as_me:19548: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19868,7 +19560,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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:19871: found $ac_dir/$ac_word" >&5
+echo "$as_me:19563: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -19876,10 +19568,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:19879: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:19571: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:19882: result: no" >&5
+  echo "$as_me:19574: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19892,7 +19584,7 @@ if test -z "$NCURSES_CONFIG"; 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:19895: checking for $ac_word" >&5
+echo "$as_me:19587: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19907,7 +19599,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_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:19910: found $ac_dir/$ac_word" >&5
+echo "$as_me:19602: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -19915,10 +19607,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:19918: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:19610: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:19921: result: no" >&5
+  echo "$as_me:19613: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19951,7 +19643,7 @@ LIBS="$cf_add_libs"
 
 # even with config script, some packages use no-override for curses.h
 
-echo "$as_me:19954: checking if we have identified curses headers" >&5
+echo "$as_me:19646: 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
@@ -19965,7 +19657,7 @@ for cf_header in  \
 	curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 19968 "configure"
+#line 19660 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -19977,16 +19669,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19980: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19672: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19983: \$? = $ac_status" >&5
+  echo "$as_me:19675: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19989: \$? = $ac_status" >&5
+  echo "$as_me:19681: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -19997,11 +19689,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20000: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:19692: 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:20004: error: No curses header-files found" >&5
+	{ { echo "$as_me:19696: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20011,23 +19703,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:20014: checking for $ac_header" >&5
+echo "$as_me:19706: 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 20020 "configure"
+#line 19712 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20024: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19716: \"$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:20030: \$? = $ac_status" >&5
+  echo "$as_me:19722: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20046,7 +19738,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20049: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:19741: 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
@@ -20099,7 +19791,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20102 "configure"
+#line 19794 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20111,16 +19803,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20114: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19806: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20117: \$? = $ac_status" >&5
+  echo "$as_me:19809: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20123: \$? = $ac_status" >&5
+  echo "$as_me:19815: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20137,7 +19829,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:20140: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19832: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20154,7 +19846,7 @@ fi
 
 }
 
-echo "$as_me:20157: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:19849: 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
@@ -20166,7 +19858,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20169 "configure"
+#line 19861 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20190,16 +19882,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20193: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19885: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20196: \$? = $ac_status" >&5
+  echo "$as_me:19888: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20199: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20202: \$? = $ac_status" >&5
+  echo "$as_me:19894: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -20214,14 +19906,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:20217: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:19909: 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:20224: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:19916: 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
@@ -20261,17 +19953,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root"
-	test -d /usr/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include"
-	test -d /usr/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/$cf_ncuhdr_root/include"
-	test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -20283,38 +19964,27 @@ test -d "$prefix" && \
 	test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
-	test -d /usr/local/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include"
-	test -d /usr/local/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include"
-	test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root"
-	test -d /opt/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include"
-	test -d /opt/$cf_ncuhdr_root/include &&       cf_search="$cf_search /opt/$cf_ncuhdr_root/include"
-	test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root"
+	test -d $cf_subdir_prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include"
+	test -d $cf_subdir_prefix/$cf_ncuhdr_root/include &&       cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include"
+	test -d $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/$cf_ncuhdr_root &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"
-	test -d $HOME/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include"
-	test -d $HOME/$cf_ncuhdr_root/include &&       cf_search="$cf_search $HOME/$cf_ncuhdr_root/include"
-	test -d $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-}
+done
 
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
@@ -20361,7 +20031,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20364 "configure"
+#line 20034 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20373,16 +20043,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20376: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20046: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20379: \$? = $ac_status" >&5
+  echo "$as_me:20049: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20382: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20385: \$? = $ac_status" >&5
+  echo "$as_me:20055: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20399,7 +20069,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:20402: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20072: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20420,7 +20090,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20423 "configure"
+#line 20093 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20444,16 +20114,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20447: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20117: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20450: \$? = $ac_status" >&5
+  echo "$as_me:20120: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20453: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20456: \$? = $ac_status" >&5
+  echo "$as_me:20126: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -20474,12 +20144,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:20477: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:20147: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:20482: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:20152: 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%/[^/]*$%%'`
@@ -20512,7 +20182,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20515 "configure"
+#line 20185 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20524,16 +20194,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20527: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20197: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20530: \$? = $ac_status" >&5
+  echo "$as_me:20200: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20536: \$? = $ac_status" >&5
+  echo "$as_me:20206: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20550,7 +20220,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:20553: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20223: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20596,7 +20266,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:20599: checking for terminfo header" >&5
+echo "$as_me:20269: 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
@@ -20614,7 +20284,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20617 "configure"
+#line 20287 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20629,16 +20299,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20632: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20302: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20635: \$? = $ac_status" >&5
+  echo "$as_me:20305: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20641: \$? = $ac_status" >&5
+  echo "$as_me:20311: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -20654,7 +20324,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20657: result: $cf_cv_term_header" >&5
+echo "$as_me:20327: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -20692,7 +20362,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:20695: checking for ncurses version" >&5
+echo "$as_me:20365: 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
@@ -20718,10 +20388,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:20721: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:20391: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:20724: \$? = $ac_status" >&5
+  echo "$as_me:20394: \$? = $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%".*%%'`
@@ -20731,7 +20401,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20734 "configure"
+#line 20404 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20756,15 +20426,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20759: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20429: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20762: \$? = $ac_status" >&5
+  echo "$as_me:20432: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20767: \$? = $ac_status" >&5
+  echo "$as_me:20437: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -20778,7 +20448,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:20781: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:20451: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -20791,7 +20461,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:20794: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:20464: 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
@@ -20799,7 +20469,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20802 "configure"
+#line 20472 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20818,16 +20488,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20821: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20491: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20824: \$? = $ac_status" >&5
+  echo "$as_me:20494: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20497: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20830: \$? = $ac_status" >&5
+  echo "$as_me:20500: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -20838,10 +20508,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20841: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:20511: 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:20844: checking for initscr in -lgpm" >&5
+  echo "$as_me:20514: 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
@@ -20849,7 +20519,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20852 "configure"
+#line 20522 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20868,16 +20538,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20871: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20541: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20874: \$? = $ac_status" >&5
+  echo "$as_me:20544: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20547: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20880: \$? = $ac_status" >&5
+  echo "$as_me:20550: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -20888,7 +20558,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20891: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:20561: 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"
@@ -20903,7 +20573,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:20906: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:20576: 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
@@ -20911,7 +20581,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20914 "configure"
+#line 20584 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20930,16 +20600,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20933: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20936: \$? = $ac_status" >&5
+  echo "$as_me:20606: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20939: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20942: \$? = $ac_status" >&5
+  echo "$as_me:20612: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -20950,7 +20620,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20953: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:20623: 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"
@@ -20999,13 +20669,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:21002: checking for initscr" >&5
+	echo "$as_me:20672: 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 21008 "configure"
+#line 20678 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -21036,16 +20706,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21039: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20709: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21042: \$? = $ac_status" >&5
+  echo "$as_me:20712: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21048: \$? = $ac_status" >&5
+  echo "$as_me:20718: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -21055,18 +20725,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21058: result: $ac_cv_func_initscr" >&5
+echo "$as_me:20728: 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:21065: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:20735: 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 21069 "configure"
+#line 20739 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21078,25 +20748,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21081: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20751: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21084: \$? = $ac_status" >&5
+  echo "$as_me:20754: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21090: \$? = $ac_status" >&5
+  echo "$as_me:20760: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21092: result: yes" >&5
+  echo "$as_me:20762: 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:21099: result: no" >&5
+echo "$as_me:20769: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -21127,17 +20797,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/lib/$cf_nculib_root"
-	test -d /usr/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/lib/$cf_nculib_root/lib"
-	test -d /usr/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/$cf_nculib_root/lib"
-	test -d /usr/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -21149,48 +20808,37 @@ test -d "$prefix" && \
 	test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
-	test -d /usr/local/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
-	test -d /usr/local/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
-	test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/lib/$cf_nculib_root"
-	test -d /opt/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /opt/lib/$cf_nculib_root/lib"
-	test -d /opt/$cf_nculib_root/lib &&       cf_search="$cf_search /opt/$cf_nculib_root/lib"
-	test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root"
+	test -d $cf_subdir_prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib"
+	test -d $cf_subdir_prefix/$cf_nculib_root/lib &&       cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib"
+	test -d $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/$cf_nculib_root &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"
-	test -d $HOME/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib"
-	test -d $HOME/$cf_nculib_root/lib &&       cf_search="$cf_search $HOME/$cf_nculib_root/lib"
-	test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
-}
+done
 
 cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:21189: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:20837: 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 21193 "configure"
+#line 20841 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21202,25 +20850,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21205: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20853: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21208: \$? = $ac_status" >&5
+  echo "$as_me:20856: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20859: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21214: \$? = $ac_status" >&5
+  echo "$as_me:20862: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21216: result: yes" >&5
+  echo "$as_me:20864: 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:21223: result: no" >&5
+echo "$as_me:20871: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -21235,7 +20883,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:21238: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:20886: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21243,7 +20891,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:21246: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:20894: 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
@@ -21253,7 +20901,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21256 "configure"
+#line 20904 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21265,23 +20913,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21268: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20916: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21271: \$? = $ac_status" >&5
+  echo "$as_me:20919: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21277: \$? = $ac_status" >&5
+  echo "$as_me:20925: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21279: result: yes" >&5
+  echo "$as_me:20927: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:21284: result: no" >&5
+echo "$as_me:20932: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -21299,7 +20947,7 @@ fi
 	;;
 ncursesw)
 
-echo "$as_me:21302: checking for multibyte character support" >&5
+echo "$as_me:20950: 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
@@ -21307,7 +20955,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21310 "configure"
+#line 20958 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -21320,16 +20968,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21323: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20971: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21326: \$? = $ac_status" >&5
+  echo "$as_me:20974: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21332: \$? = $ac_status" >&5
+  echo "$as_me:20980: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -21341,12 +20989,12 @@ cat conftest.$ac_ext >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:21344: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:20992: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 21349 "configure"
+#line 20997 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -21359,16 +21007,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21362: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21010: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21365: \$? = $ac_status" >&5
+  echo "$as_me:21013: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21371: \$? = $ac_status" >&5
+  echo "$as_me:21019: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -21382,7 +21030,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 21385 "configure"
+#line 21033 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -21395,16 +21043,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21398: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21046: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21401: \$? = $ac_status" >&5
+  echo "$as_me:21049: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21407: \$? = $ac_status" >&5
+  echo "$as_me:21055: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -21421,9 +21069,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:21424: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:21072: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:21426: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:21074: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -21460,17 +21108,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/utf8 &&       cf_search="$cf_search /usr/include/utf8"
-	test -d /usr/include/utf8/include &&    cf_search="$cf_search /usr/include/utf8/include"
-	test -d /usr/utf8/include &&       cf_search="$cf_search /usr/utf8/include"
-	test -d /usr/utf8/include/utf8 &&    cf_search="$cf_search /usr/utf8/include/utf8"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -21482,38 +21119,27 @@ test -d "$prefix" && \
 	test -d $prefix/utf8/include/utf8 &&    cf_search="$cf_search $prefix/utf8/include/utf8"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/utf8 &&       cf_search="$cf_search /usr/local/include/utf8"
-	test -d /usr/local/include/utf8/include &&    cf_search="$cf_search /usr/local/include/utf8/include"
-	test -d /usr/local/utf8/include &&       cf_search="$cf_search /usr/local/utf8/include"
-	test -d /usr/local/utf8/include/utf8 &&    cf_search="$cf_search /usr/local/utf8/include/utf8"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/utf8 &&       cf_search="$cf_search /opt/include/utf8"
-	test -d /opt/include/utf8/include &&    cf_search="$cf_search /opt/include/utf8/include"
-	test -d /opt/utf8/include &&       cf_search="$cf_search /opt/utf8/include"
-	test -d /opt/utf8/include/utf8 &&    cf_search="$cf_search /opt/utf8/include/utf8"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/utf8 &&       cf_search="$cf_search $cf_subdir_prefix/include/utf8"
+	test -d $cf_subdir_prefix/include/utf8/include &&    cf_search="$cf_search $cf_subdir_prefix/include/utf8/include"
+	test -d $cf_subdir_prefix/utf8/include &&       cf_search="$cf_search $cf_subdir_prefix/utf8/include"
+	test -d $cf_subdir_prefix/utf8/include/utf8 &&    cf_search="$cf_search $cf_subdir_prefix/utf8/include/utf8"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/utf8 &&       cf_search="$cf_search $HOME/include/utf8"
-	test -d $HOME/include/utf8/include &&    cf_search="$cf_search $HOME/include/utf8/include"
-	test -d $HOME/utf8/include &&       cf_search="$cf_search $HOME/utf8/include"
-	test -d $HOME/utf8/include/utf8 &&    cf_search="$cf_search $HOME/utf8/include/utf8"
-}
+done
 
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
@@ -21536,11 +21162,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_utf8 ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:21539: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:21165: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
         cat >conftest.$ac_ext <<_ACEOF
-#line 21543 "configure"
+#line 21169 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -21553,21 +21179,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21556: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21559: \$? = $ac_status" >&5
+  echo "$as_me:21185: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21565: \$? = $ac_status" >&5
+  echo "$as_me:21191: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:21570: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:21196: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
             cf_cv_find_linkage_utf8=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -21585,7 +21211,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:21588: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:21214: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -21620,17 +21246,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/utf8 &&       cf_search="$cf_search /usr/lib/utf8"
-	test -d /usr/lib/utf8/lib &&    cf_search="$cf_search /usr/lib/utf8/lib"
-	test -d /usr/utf8/lib &&       cf_search="$cf_search /usr/utf8/lib"
-	test -d /usr/utf8/lib/utf8 &&    cf_search="$cf_search /usr/utf8/lib/utf8"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -21642,38 +21257,27 @@ test -d "$prefix" && \
 	test -d $prefix/utf8/lib/utf8 &&    cf_search="$cf_search $prefix/utf8/lib/utf8"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/utf8 &&       cf_search="$cf_search /usr/local/lib/utf8"
-	test -d /usr/local/lib/utf8/lib &&    cf_search="$cf_search /usr/local/lib/utf8/lib"
-	test -d /usr/local/utf8/lib &&       cf_search="$cf_search /usr/local/utf8/lib"
-	test -d /usr/local/utf8/lib/utf8 &&    cf_search="$cf_search /usr/local/utf8/lib/utf8"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/utf8 &&       cf_search="$cf_search /opt/lib/utf8"
-	test -d /opt/lib/utf8/lib &&    cf_search="$cf_search /opt/lib/utf8/lib"
-	test -d /opt/utf8/lib &&       cf_search="$cf_search /opt/utf8/lib"
-	test -d /opt/utf8/lib/utf8 &&    cf_search="$cf_search /opt/utf8/lib/utf8"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/utf8 &&       cf_search="$cf_search $cf_subdir_prefix/lib/utf8"
+	test -d $cf_subdir_prefix/lib/utf8/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/utf8/lib"
+	test -d $cf_subdir_prefix/utf8/lib &&       cf_search="$cf_search $cf_subdir_prefix/utf8/lib"
+	test -d $cf_subdir_prefix/utf8/lib/utf8 &&    cf_search="$cf_search $cf_subdir_prefix/utf8/lib/utf8"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/utf8 &&       cf_search="$cf_search $HOME/lib/utf8"
-	test -d $HOME/lib/utf8/lib &&    cf_search="$cf_search $HOME/lib/utf8/lib"
-	test -d $HOME/utf8/lib &&       cf_search="$cf_search $HOME/utf8/lib"
-	test -d $HOME/utf8/lib/utf8 &&    cf_search="$cf_search $HOME/utf8/lib/utf8"
-}
+done
 
 cf_search="$cf_library_path_list $cf_search"
 
@@ -21682,13 +21286,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_utf8 ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:21685: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:21289: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lutf8  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
             cat >conftest.$ac_ext <<_ACEOF
-#line 21691 "configure"
+#line 21295 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -21701,21 +21305,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21704: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21308: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21707: \$? = $ac_status" >&5
+  echo "$as_me:21311: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21314: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21713: \$? = $ac_status" >&5
+  echo "$as_me:21317: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:21718: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:21322: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
                 cf_cv_find_linkage_utf8=yes
                 cf_cv_library_file_utf8="-lutf8"
@@ -21757,7 +21361,7 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21760: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:21364: 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
@@ -21792,7 +21396,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21795 "configure"
+#line 21399 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21804,16 +21408,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21807: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21411: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21810: \$? = $ac_status" >&5
+  echo "$as_me:21414: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21417: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21816: \$? = $ac_status" >&5
+  echo "$as_me:21420: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21830,7 +21434,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:21833: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21437: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21864,7 +21468,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:21867: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:21471: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -21899,7 +21503,7 @@ if test -n "$ac_tool_prefix"; 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:21902: checking for $ac_word" >&5
+echo "$as_me:21506: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21914,7 +21518,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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:21917: found $ac_dir/$ac_word" >&5
+echo "$as_me:21521: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -21922,10 +21526,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:21925: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:21529: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:21928: result: no" >&5
+  echo "$as_me:21532: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21938,7 +21542,7 @@ if test -z "$NCURSES_CONFIG"; 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:21941: checking for $ac_word" >&5
+echo "$as_me:21545: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21953,7 +21557,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_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:21956: found $ac_dir/$ac_word" >&5
+echo "$as_me:21560: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -21961,10 +21565,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:21964: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:21568: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:21967: result: no" >&5
+  echo "$as_me:21571: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21997,7 +21601,7 @@ LIBS="$cf_add_libs"
 
 # even with config script, some packages use no-override for curses.h
 
-echo "$as_me:22000: checking if we have identified curses headers" >&5
+echo "$as_me:21604: 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
@@ -22011,7 +21615,7 @@ for cf_header in  \
 	curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 22014 "configure"
+#line 21618 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -22023,16 +21627,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22026: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21630: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22029: \$? = $ac_status" >&5
+  echo "$as_me:21633: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22035: \$? = $ac_status" >&5
+  echo "$as_me:21639: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -22043,11 +21647,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:22046: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:21650: 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:22050: error: No curses header-files found" >&5
+	{ { echo "$as_me:21654: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22057,23 +21661,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:22060: checking for $ac_header" >&5
+echo "$as_me:21664: 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 22066 "configure"
+#line 21670 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22070: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21674: \"$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:22076: \$? = $ac_status" >&5
+  echo "$as_me:21680: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22092,7 +21696,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:22095: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21699: 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
@@ -22145,7 +21749,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22148 "configure"
+#line 21752 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22157,16 +21761,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22160: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21764: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22163: \$? = $ac_status" >&5
+  echo "$as_me:21767: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22169: \$? = $ac_status" >&5
+  echo "$as_me:21773: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22183,7 +21787,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:22186: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21790: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22200,7 +21804,7 @@ fi
 
 }
 
-echo "$as_me:22203: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:21807: 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
@@ -22212,7 +21816,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22215 "configure"
+#line 21819 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -22244,16 +21848,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22247: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21851: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22250: \$? = $ac_status" >&5
+  echo "$as_me:21854: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22256: \$? = $ac_status" >&5
+  echo "$as_me:21860: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -22268,14 +21872,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:22271: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:21875: 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:22278: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:21882: 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
@@ -22315,17 +21919,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root"
-	test -d /usr/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include"
-	test -d /usr/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/$cf_ncuhdr_root/include"
-	test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -22337,38 +21930,27 @@ test -d "$prefix" && \
 	test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
-	test -d /usr/local/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include"
-	test -d /usr/local/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include"
-	test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root"
-	test -d /opt/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include"
-	test -d /opt/$cf_ncuhdr_root/include &&       cf_search="$cf_search /opt/$cf_ncuhdr_root/include"
-	test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root"
+	test -d $cf_subdir_prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include"
+	test -d $cf_subdir_prefix/$cf_ncuhdr_root/include &&       cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include"
+	test -d $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/$cf_ncuhdr_root &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"
-	test -d $HOME/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include"
-	test -d $HOME/$cf_ncuhdr_root/include &&       cf_search="$cf_search $HOME/$cf_ncuhdr_root/include"
-	test -d $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-}
+done
 
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
@@ -22415,7 +21997,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22418 "configure"
+#line 22000 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22427,16 +22009,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22430: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22012: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22433: \$? = $ac_status" >&5
+  echo "$as_me:22015: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22436: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22439: \$? = $ac_status" >&5
+  echo "$as_me:22021: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22453,7 +22035,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:22456: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22038: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22474,7 +22056,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22477 "configure"
+#line 22059 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -22498,16 +22080,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22501: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22083: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22504: \$? = $ac_status" >&5
+  echo "$as_me:22086: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22089: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22510: \$? = $ac_status" >&5
+  echo "$as_me:22092: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -22528,12 +22110,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:22531: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:22113: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:22536: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:22118: 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%/[^/]*$%%'`
@@ -22566,7 +22148,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22569 "configure"
+#line 22151 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22578,16 +22160,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22581: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22163: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22584: \$? = $ac_status" >&5
+  echo "$as_me:22166: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22169: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22590: \$? = $ac_status" >&5
+  echo "$as_me:22172: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22604,7 +22186,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:22607: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22189: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22650,7 +22232,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:22653: checking for terminfo header" >&5
+echo "$as_me:22235: 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
@@ -22668,7 +22250,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 22671 "configure"
+#line 22253 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22683,16 +22265,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22686: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22268: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22689: \$? = $ac_status" >&5
+  echo "$as_me:22271: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22692: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22695: \$? = $ac_status" >&5
+  echo "$as_me:22277: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -22708,7 +22290,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:22711: result: $cf_cv_term_header" >&5
+echo "$as_me:22293: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -22746,7 +22328,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:22749: checking for ncurses version" >&5
+echo "$as_me:22331: 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
@@ -22772,10 +22354,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:22775: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:22357: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:22778: \$? = $ac_status" >&5
+  echo "$as_me:22360: \$? = $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%".*%%'`
@@ -22785,7 +22367,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22788 "configure"
+#line 22370 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22810,15 +22392,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22813: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22395: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22816: \$? = $ac_status" >&5
+  echo "$as_me:22398: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22400: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22821: \$? = $ac_status" >&5
+  echo "$as_me:22403: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -22832,7 +22414,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:22835: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:22417: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -22845,7 +22427,7 @@ cf_nculib_root=ncursesw
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:22848: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:22430: 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
@@ -22853,7 +22435,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22856 "configure"
+#line 22438 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22872,16 +22454,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22875: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22457: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22878: \$? = $ac_status" >&5
+  echo "$as_me:22460: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22884: \$? = $ac_status" >&5
+  echo "$as_me:22466: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -22892,10 +22474,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22895: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:22477: 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:22898: checking for initscr in -lgpm" >&5
+  echo "$as_me:22480: 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
@@ -22903,7 +22485,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22906 "configure"
+#line 22488 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22922,16 +22504,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22925: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22507: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22928: \$? = $ac_status" >&5
+  echo "$as_me:22510: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22934: \$? = $ac_status" >&5
+  echo "$as_me:22516: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -22942,7 +22524,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22945: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:22527: 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"
@@ -22957,7 +22539,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:22960: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:22542: 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
@@ -22965,7 +22547,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22968 "configure"
+#line 22550 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22984,16 +22566,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22987: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22569: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22990: \$? = $ac_status" >&5
+  echo "$as_me:22572: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22996: \$? = $ac_status" >&5
+  echo "$as_me:22578: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -23004,7 +22586,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23007: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:22589: 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"
@@ -23053,13 +22635,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:23056: checking for initscr" >&5
+	echo "$as_me:22638: 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 23062 "configure"
+#line 22644 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -23090,16 +22672,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23093: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22675: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23096: \$? = $ac_status" >&5
+  echo "$as_me:22678: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23102: \$? = $ac_status" >&5
+  echo "$as_me:22684: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -23109,18 +22691,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23112: result: $ac_cv_func_initscr" >&5
+echo "$as_me:22694: 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:23119: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:22701: 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 23123 "configure"
+#line 22705 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23132,25 +22714,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23135: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22717: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23138: \$? = $ac_status" >&5
+  echo "$as_me:22720: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22723: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23144: \$? = $ac_status" >&5
+  echo "$as_me:22726: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23146: result: yes" >&5
+  echo "$as_me:22728: 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:23153: result: no" >&5
+echo "$as_me:22735: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23181,17 +22763,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/lib/$cf_nculib_root"
-	test -d /usr/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/lib/$cf_nculib_root/lib"
-	test -d /usr/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/$cf_nculib_root/lib"
-	test -d /usr/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -23203,48 +22774,37 @@ test -d "$prefix" && \
 	test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
-	test -d /usr/local/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
-	test -d /usr/local/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
-	test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/lib/$cf_nculib_root"
-	test -d /opt/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /opt/lib/$cf_nculib_root/lib"
-	test -d /opt/$cf_nculib_root/lib &&       cf_search="$cf_search /opt/$cf_nculib_root/lib"
-	test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root"
+	test -d $cf_subdir_prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib"
+	test -d $cf_subdir_prefix/$cf_nculib_root/lib &&       cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib"
+	test -d $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/$cf_nculib_root &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"
-	test -d $HOME/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib"
-	test -d $HOME/$cf_nculib_root/lib &&       cf_search="$cf_search $HOME/$cf_nculib_root/lib"
-	test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
-}
+done
 
 cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23243: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:22803: 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 23247 "configure"
+#line 22807 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23256,25 +22816,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23259: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22819: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23262: \$? = $ac_status" >&5
+  echo "$as_me:22822: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23268: \$? = $ac_status" >&5
+  echo "$as_me:22828: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23270: result: yes" >&5
+  echo "$as_me:22830: 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:23277: result: no" >&5
+echo "$as_me:22837: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -23289,7 +22849,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:23292: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:22852: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -23297,7 +22857,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:23300: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:22860: 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
@@ -23307,7 +22867,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23310 "configure"
+#line 22870 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23319,23 +22879,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22882: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23325: \$? = $ac_status" >&5
+  echo "$as_me:22885: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22888: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23331: \$? = $ac_status" >&5
+  echo "$as_me:22891: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23333: result: yes" >&5
+  echo "$as_me:22893: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23338: result: no" >&5
+echo "$as_me:22898: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -23365,7 +22925,7 @@ pdcurses)
 	;;
 slang)
 
-echo "$as_me:23368: checking for slang header file" >&5
+echo "$as_me:22928: 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
@@ -23373,7 +22933,7 @@ else
 
 	cf_cv_slang_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23376 "configure"
+#line 22936 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23385,16 +22945,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23388: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22948: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23391: \$? = $ac_status" >&5
+  echo "$as_me:22951: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22954: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23397: \$? = $ac_status" >&5
+  echo "$as_me:22957: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -23433,17 +22993,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/slang &&       cf_search="$cf_search /usr/include/slang"
-	test -d /usr/include/slang/include &&    cf_search="$cf_search /usr/include/slang/include"
-	test -d /usr/slang/include &&       cf_search="$cf_search /usr/slang/include"
-	test -d /usr/slang/include/slang &&    cf_search="$cf_search /usr/slang/include/slang"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -23455,38 +23004,27 @@ test -d "$prefix" && \
 	test -d $prefix/slang/include/slang &&    cf_search="$cf_search $prefix/slang/include/slang"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/slang &&       cf_search="$cf_search /usr/local/include/slang"
-	test -d /usr/local/include/slang/include &&    cf_search="$cf_search /usr/local/include/slang/include"
-	test -d /usr/local/slang/include &&       cf_search="$cf_search /usr/local/slang/include"
-	test -d /usr/local/slang/include/slang &&    cf_search="$cf_search /usr/local/slang/include/slang"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/slang &&       cf_search="$cf_search /opt/include/slang"
-	test -d /opt/include/slang/include &&    cf_search="$cf_search /opt/include/slang/include"
-	test -d /opt/slang/include &&       cf_search="$cf_search /opt/slang/include"
-	test -d /opt/slang/include/slang &&    cf_search="$cf_search /opt/slang/include/slang"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/slang &&       cf_search="$cf_search $cf_subdir_prefix/include/slang"
+	test -d $cf_subdir_prefix/include/slang/include &&    cf_search="$cf_search $cf_subdir_prefix/include/slang/include"
+	test -d $cf_subdir_prefix/slang/include &&       cf_search="$cf_search $cf_subdir_prefix/slang/include"
+	test -d $cf_subdir_prefix/slang/include/slang &&    cf_search="$cf_search $cf_subdir_prefix/slang/include/slang"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/slang &&       cf_search="$cf_search $HOME/include/slang"
-	test -d $HOME/include/slang/include &&    cf_search="$cf_search $HOME/include/slang/include"
-	test -d $HOME/slang/include &&       cf_search="$cf_search $HOME/slang/include"
-	test -d $HOME/slang/include/slang &&    cf_search="$cf_search $HOME/slang/include/slang"
-}
+done
 
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
@@ -23521,7 +23059,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23524: result: $cf_cv_slang_header" >&5
+echo "$as_me:23062: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 
 if test "x$cf_cv_slang_header" != xno
@@ -23562,7 +23100,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 23565 "configure"
+#line 23103 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23574,16 +23112,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23577: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23115: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23580: \$? = $ac_status" >&5
+  echo "$as_me:23118: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23583: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23586: \$? = $ac_status" >&5
+  echo "$as_me:23124: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -23600,7 +23138,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:23603: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23141: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -23630,7 +23168,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 23633 "configure"
+#line 23171 "configure"
 #include "confdefs.h"
 
 int
@@ -23642,19 +23180,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23645: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23183: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23648: \$? = $ac_status" >&5
+  echo "$as_me:23186: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23654: \$? = $ac_status" >&5
+  echo "$as_me:23192: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 23657 "configure"
+#line 23195 "configure"
 #include "confdefs.h"
 
 int
@@ -23666,16 +23204,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23669: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23207: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23672: \$? = $ac_status" >&5
+  echo "$as_me:23210: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23678: \$? = $ac_status" >&5
+  echo "$as_me:23216: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -23686,7 +23224,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}:23689: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:23227: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -23701,10 +23239,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:23704: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:23242: 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 23707 "configure"
+#line 23245 "configure"
 #include "confdefs.h"
 
 int
@@ -23716,16 +23254,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23719: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23257: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23722: \$? = $ac_status" >&5
+  echo "$as_me:23260: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23728: \$? = $ac_status" >&5
+  echo "$as_me:23266: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -23734,7 +23272,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:23737: result: $cf_result" >&5
+			echo "$as_me:23275: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -23751,7 +23289,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:23754: checking for initscr in -lcurses" >&5
+	echo "$as_me:23292: 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
@@ -23759,7 +23297,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23762 "configure"
+#line 23300 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23778,16 +23316,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23781: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23784: \$? = $ac_status" >&5
+  echo "$as_me:23322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23787: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23790: \$? = $ac_status" >&5
+  echo "$as_me:23328: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -23798,7 +23336,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23801: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:23339: 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
 
@@ -23820,7 +23358,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:23823: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:23361: 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
@@ -23828,7 +23366,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23831 "configure"
+#line 23369 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23847,16 +23385,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23850: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23388: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23853: \$? = $ac_status" >&5
+  echo "$as_me:23391: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23856: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23859: \$? = $ac_status" >&5
+  echo "$as_me:23397: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -23867,7 +23405,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23870: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:23408: 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
 
@@ -23894,20 +23432,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:23897: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:23435: 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:23904: checking for acos" >&5
+echo "$as_me:23442: 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 23910 "configure"
+#line 23448 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -23938,16 +23476,16 @@ f = acos; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23941: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23479: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23944: \$? = $ac_status" >&5
+  echo "$as_me:23482: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23485: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23950: \$? = $ac_status" >&5
+  echo "$as_me:23488: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -23957,13 +23495,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23960: result: $ac_cv_func_acos" >&5
+echo "$as_me:23498: 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:23966: checking for acos in -lm" >&5
+echo "$as_me:23504: 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
@@ -23971,7 +23509,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23974 "configure"
+#line 23512 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23990,16 +23528,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23993: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23531: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23996: \$? = $ac_status" >&5
+  echo "$as_me:23534: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24002: \$? = $ac_status" >&5
+  echo "$as_me:23540: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -24010,7 +23548,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24013: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:23551: 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
 
@@ -24036,13 +23574,13 @@ os2*)
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:24039: checking for v_init" >&5
+	echo "$as_me:23577: 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 24045 "configure"
+#line 23583 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -24073,16 +23611,16 @@ f = v_init; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24076: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23614: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24079: \$? = $ac_status" >&5
+  echo "$as_me:23617: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24085: \$? = $ac_status" >&5
+  echo "$as_me:23623: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -24092,18 +23630,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24095: result: $ac_cv_func_v_init" >&5
+echo "$as_me:23633: 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:24102: checking for v_init in -lvideo" >&5
+		echo "$as_me:23640: 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 24106 "configure"
+#line 23644 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -24115,25 +23653,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24118: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23656: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24121: \$? = $ac_status" >&5
+  echo "$as_me:23659: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24127: \$? = $ac_status" >&5
+  echo "$as_me:23665: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24129: result: yes" >&5
+  echo "$as_me:23667: 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:24136: result: no" >&5
+echo "$as_me:23674: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -24164,17 +23702,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/video &&       cf_search="$cf_search /usr/lib/video"
-	test -d /usr/lib/video/lib &&    cf_search="$cf_search /usr/lib/video/lib"
-	test -d /usr/video/lib &&       cf_search="$cf_search /usr/video/lib"
-	test -d /usr/video/lib/video &&    cf_search="$cf_search /usr/video/lib/video"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -24186,48 +23713,37 @@ test -d "$prefix" && \
 	test -d $prefix/video/lib/video &&    cf_search="$cf_search $prefix/video/lib/video"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/video &&       cf_search="$cf_search /usr/local/lib/video"
-	test -d /usr/local/lib/video/lib &&    cf_search="$cf_search /usr/local/lib/video/lib"
-	test -d /usr/local/video/lib &&       cf_search="$cf_search /usr/local/video/lib"
-	test -d /usr/local/video/lib/video &&    cf_search="$cf_search /usr/local/video/lib/video"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/video &&       cf_search="$cf_search /opt/lib/video"
-	test -d /opt/lib/video/lib &&    cf_search="$cf_search /opt/lib/video/lib"
-	test -d /opt/video/lib &&       cf_search="$cf_search /opt/video/lib"
-	test -d /opt/video/lib/video &&    cf_search="$cf_search /opt/video/lib/video"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/video &&       cf_search="$cf_search $cf_subdir_prefix/lib/video"
+	test -d $cf_subdir_prefix/lib/video/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/video/lib"
+	test -d $cf_subdir_prefix/video/lib &&       cf_search="$cf_search $cf_subdir_prefix/video/lib"
+	test -d $cf_subdir_prefix/video/lib/video &&    cf_search="$cf_search $cf_subdir_prefix/video/lib/video"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/video &&       cf_search="$cf_search $HOME/lib/video"
-	test -d $HOME/lib/video/lib &&    cf_search="$cf_search $HOME/lib/video/lib"
-	test -d $HOME/video/lib &&       cf_search="$cf_search $HOME/video/lib"
-	test -d $HOME/video/lib/video &&    cf_search="$cf_search $HOME/video/lib/video"
-}
+done
 
 cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:24226: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:23742: 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 24230 "configure"
+#line 23746 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -24239,25 +23755,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24242: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24245: \$? = $ac_status" >&5
+  echo "$as_me:23761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24251: \$? = $ac_status" >&5
+  echo "$as_me:23767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24253: result: yes" >&5
+  echo "$as_me:23769: 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:24260: result: no" >&5
+echo "$as_me:23776: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24272,7 +23788,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:24275: error: Cannot link video library" >&5
+	{ { echo "$as_me:23791: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -24282,13 +23798,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:24285: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:23801: 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 24291 "configure"
+#line 23807 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -24319,16 +23835,16 @@ f = SLtt_get_screen_size; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24325: \$? = $ac_status" >&5
+  echo "$as_me:23841: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23844: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24331: \$? = $ac_status" >&5
+  echo "$as_me:23847: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -24338,18 +23854,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:24341: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:23857: 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:24348: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:23864: 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 24352 "configure"
+#line 23868 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24361,25 +23877,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24364: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24367: \$? = $ac_status" >&5
+  echo "$as_me:23883: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24373: \$? = $ac_status" >&5
+  echo "$as_me:23889: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24375: result: yes" >&5
+  echo "$as_me:23891: 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:24382: result: no" >&5
+echo "$as_me:23898: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -24410,17 +23926,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/slang &&       cf_search="$cf_search /usr/lib/slang"
-	test -d /usr/lib/slang/lib &&    cf_search="$cf_search /usr/lib/slang/lib"
-	test -d /usr/slang/lib &&       cf_search="$cf_search /usr/slang/lib"
-	test -d /usr/slang/lib/slang &&    cf_search="$cf_search /usr/slang/lib/slang"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -24432,48 +23937,37 @@ test -d "$prefix" && \
 	test -d $prefix/slang/lib/slang &&    cf_search="$cf_search $prefix/slang/lib/slang"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/slang &&       cf_search="$cf_search /usr/local/lib/slang"
-	test -d /usr/local/lib/slang/lib &&    cf_search="$cf_search /usr/local/lib/slang/lib"
-	test -d /usr/local/slang/lib &&       cf_search="$cf_search /usr/local/slang/lib"
-	test -d /usr/local/slang/lib/slang &&    cf_search="$cf_search /usr/local/slang/lib/slang"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/slang &&       cf_search="$cf_search /opt/lib/slang"
-	test -d /opt/lib/slang/lib &&    cf_search="$cf_search /opt/lib/slang/lib"
-	test -d /opt/slang/lib &&       cf_search="$cf_search /opt/slang/lib"
-	test -d /opt/slang/lib/slang &&    cf_search="$cf_search /opt/slang/lib/slang"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/slang &&       cf_search="$cf_search $cf_subdir_prefix/lib/slang"
+	test -d $cf_subdir_prefix/lib/slang/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/slang/lib"
+	test -d $cf_subdir_prefix/slang/lib &&       cf_search="$cf_search $cf_subdir_prefix/slang/lib"
+	test -d $cf_subdir_prefix/slang/lib/slang &&    cf_search="$cf_search $cf_subdir_prefix/slang/lib/slang"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/slang &&       cf_search="$cf_search $HOME/lib/slang"
-	test -d $HOME/lib/slang/lib &&    cf_search="$cf_search $HOME/lib/slang/lib"
-	test -d $HOME/slang/lib &&       cf_search="$cf_search $HOME/slang/lib"
-	test -d $HOME/slang/lib/slang &&    cf_search="$cf_search $HOME/slang/lib/slang"
-}
+done
 
 cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:24472: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:23966: 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 24476 "configure"
+#line 23970 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24485,25 +23979,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24488: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23982: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24491: \$? = $ac_status" >&5
+  echo "$as_me:23985: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23988: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24497: \$? = $ac_status" >&5
+  echo "$as_me:23991: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24499: result: yes" >&5
+  echo "$as_me:23993: 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:24506: result: no" >&5
+echo "$as_me:24000: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24518,13 +24012,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:24521: error: Cannot link slang library" >&5
+	{ { echo "$as_me:24015: 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:24527: checking if we can link slang without termcap" >&5
+echo "$as_me:24021: 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%^.%%'`
@@ -24533,7 +24027,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 24536 "configure"
+#line 24030 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24545,16 +24039,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24042: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24551: \$? = $ac_status" >&5
+  echo "$as_me:24045: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24557: \$? = $ac_status" >&5
+  echo "$as_me:24051: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -24563,13 +24057,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:24566: result: $cf_result" >&5
+echo "$as_me:24060: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 else
 
-echo "$as_me:24572: checking for slang2 header file" >&5
+echo "$as_me:24066: checking for slang2 header file" >&5
 echo $ECHO_N "checking for slang2 header file... $ECHO_C" >&6
 if test "${cf_cv_slang2_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24577,7 +24071,7 @@ else
 
 	cf_cv_slang2_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24580 "configure"
+#line 24074 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24589,16 +24083,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24592: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24086: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24595: \$? = $ac_status" >&5
+  echo "$as_me:24089: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24092: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24601: \$? = $ac_status" >&5
+  echo "$as_me:24095: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang2_header=predefined
 else
@@ -24637,17 +24131,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/slang2 &&       cf_search="$cf_search /usr/include/slang2"
-	test -d /usr/include/slang2/include &&    cf_search="$cf_search /usr/include/slang2/include"
-	test -d /usr/slang2/include &&       cf_search="$cf_search /usr/slang2/include"
-	test -d /usr/slang2/include/slang2 &&    cf_search="$cf_search /usr/slang2/include/slang2"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -24659,38 +24142,27 @@ test -d "$prefix" && \
 	test -d $prefix/slang2/include/slang2 &&    cf_search="$cf_search $prefix/slang2/include/slang2"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/slang2 &&       cf_search="$cf_search /usr/local/include/slang2"
-	test -d /usr/local/include/slang2/include &&    cf_search="$cf_search /usr/local/include/slang2/include"
-	test -d /usr/local/slang2/include &&       cf_search="$cf_search /usr/local/slang2/include"
-	test -d /usr/local/slang2/include/slang2 &&    cf_search="$cf_search /usr/local/slang2/include/slang2"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/slang2 &&       cf_search="$cf_search /opt/include/slang2"
-	test -d /opt/include/slang2/include &&    cf_search="$cf_search /opt/include/slang2/include"
-	test -d /opt/slang2/include &&       cf_search="$cf_search /opt/slang2/include"
-	test -d /opt/slang2/include/slang2 &&    cf_search="$cf_search /opt/slang2/include/slang2"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/slang2 &&       cf_search="$cf_search $cf_subdir_prefix/include/slang2"
+	test -d $cf_subdir_prefix/include/slang2/include &&    cf_search="$cf_search $cf_subdir_prefix/include/slang2/include"
+	test -d $cf_subdir_prefix/slang2/include &&       cf_search="$cf_search $cf_subdir_prefix/slang2/include"
+	test -d $cf_subdir_prefix/slang2/include/slang2 &&    cf_search="$cf_search $cf_subdir_prefix/slang2/include/slang2"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/slang2 &&       cf_search="$cf_search $HOME/include/slang2"
-	test -d $HOME/include/slang2/include &&    cf_search="$cf_search $HOME/include/slang2/include"
-	test -d $HOME/slang2/include &&       cf_search="$cf_search $HOME/slang2/include"
-	test -d $HOME/slang2/include/slang2 &&    cf_search="$cf_search $HOME/slang2/include/slang2"
-}
+done
 
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
@@ -24725,7 +24197,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24728: result: $cf_cv_slang2_header" >&5
+echo "$as_me:24200: result: $cf_cv_slang2_header" >&5
 echo "${ECHO_T}$cf_cv_slang2_header" >&6
 
 if test "x$cf_cv_slang2_header" != xno
@@ -24766,7 +24238,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 24769 "configure"
+#line 24241 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24778,16 +24250,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24781: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24253: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24784: \$? = $ac_status" >&5
+  echo "$as_me:24256: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24787: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24790: \$? = $ac_status" >&5
+  echo "$as_me:24262: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24804,7 +24276,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24807: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24279: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24834,7 +24306,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 24837 "configure"
+#line 24309 "configure"
 #include "confdefs.h"
 
 int
@@ -24846,19 +24318,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24849: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24852: \$? = $ac_status" >&5
+  echo "$as_me:24324: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24858: \$? = $ac_status" >&5
+  echo "$as_me:24330: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 24861 "configure"
+#line 24333 "configure"
 #include "confdefs.h"
 
 int
@@ -24870,16 +24342,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24873: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24345: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24876: \$? = $ac_status" >&5
+  echo "$as_me:24348: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24879: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24882: \$? = $ac_status" >&5
+  echo "$as_me:24354: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -24890,7 +24362,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}:24893: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:24365: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -24905,10 +24377,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:24908: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:24380: 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 24911 "configure"
+#line 24383 "configure"
 #include "confdefs.h"
 
 int
@@ -24920,16 +24392,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24923: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24395: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24926: \$? = $ac_status" >&5
+  echo "$as_me:24398: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24401: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24932: \$? = $ac_status" >&5
+  echo "$as_me:24404: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -24938,7 +24410,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:24941: result: $cf_result" >&5
+			echo "$as_me:24413: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -24955,7 +24427,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:24958: checking for initscr in -lcurses" >&5
+	echo "$as_me:24430: 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
@@ -24963,7 +24435,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24966 "configure"
+#line 24438 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24982,16 +24454,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24985: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24457: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24988: \$? = $ac_status" >&5
+  echo "$as_me:24460: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24994: \$? = $ac_status" >&5
+  echo "$as_me:24466: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -25002,7 +24474,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25005: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:24477: 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
 
@@ -25024,7 +24496,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:25027: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:24499: 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
@@ -25032,7 +24504,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 25035 "configure"
+#line 24507 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25051,16 +24523,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25054: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24526: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25057: \$? = $ac_status" >&5
+  echo "$as_me:24529: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25063: \$? = $ac_status" >&5
+  echo "$as_me:24535: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -25071,7 +24543,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25074: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:24546: 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
 
@@ -25098,20 +24570,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:25101: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:24573: 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:25108: checking for acos" >&5
+echo "$as_me:24580: 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 25114 "configure"
+#line 24586 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -25142,16 +24614,16 @@ f = acos; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24617: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25148: \$? = $ac_status" >&5
+  echo "$as_me:24620: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24623: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25154: \$? = $ac_status" >&5
+  echo "$as_me:24626: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -25161,13 +24633,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:25164: result: $ac_cv_func_acos" >&5
+echo "$as_me:24636: 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:25170: checking for acos in -lm" >&5
+echo "$as_me:24642: 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
@@ -25175,7 +24647,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 25178 "configure"
+#line 24650 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25194,16 +24666,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25197: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24669: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25200: \$? = $ac_status" >&5
+  echo "$as_me:24672: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24675: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25206: \$? = $ac_status" >&5
+  echo "$as_me:24678: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -25214,7 +24686,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25217: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:24689: 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
 
@@ -25240,13 +24712,13 @@ os2*)
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:25243: checking for v_init" >&5
+	echo "$as_me:24715: 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 25249 "configure"
+#line 24721 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -25277,16 +24749,16 @@ f = v_init; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25280: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24752: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25283: \$? = $ac_status" >&5
+  echo "$as_me:24755: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25286: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25289: \$? = $ac_status" >&5
+  echo "$as_me:24761: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -25296,18 +24768,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:25299: result: $ac_cv_func_v_init" >&5
+echo "$as_me:24771: 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:25306: checking for v_init in -lvideo" >&5
+		echo "$as_me:24778: 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 25310 "configure"
+#line 24782 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -25319,25 +24791,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24794: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25325: \$? = $ac_status" >&5
+  echo "$as_me:24797: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24800: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25331: \$? = $ac_status" >&5
+  echo "$as_me:24803: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25333: result: yes" >&5
+  echo "$as_me:24805: 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:25340: result: no" >&5
+echo "$as_me:24812: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -25368,17 +24840,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/video &&       cf_search="$cf_search /usr/lib/video"
-	test -d /usr/lib/video/lib &&    cf_search="$cf_search /usr/lib/video/lib"
-	test -d /usr/video/lib &&       cf_search="$cf_search /usr/video/lib"
-	test -d /usr/video/lib/video &&    cf_search="$cf_search /usr/video/lib/video"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -25390,48 +24851,37 @@ test -d "$prefix" && \
 	test -d $prefix/video/lib/video &&    cf_search="$cf_search $prefix/video/lib/video"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/video &&       cf_search="$cf_search /usr/local/lib/video"
-	test -d /usr/local/lib/video/lib &&    cf_search="$cf_search /usr/local/lib/video/lib"
-	test -d /usr/local/video/lib &&       cf_search="$cf_search /usr/local/video/lib"
-	test -d /usr/local/video/lib/video &&    cf_search="$cf_search /usr/local/video/lib/video"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/video &&       cf_search="$cf_search /opt/lib/video"
-	test -d /opt/lib/video/lib &&    cf_search="$cf_search /opt/lib/video/lib"
-	test -d /opt/video/lib &&       cf_search="$cf_search /opt/video/lib"
-	test -d /opt/video/lib/video &&    cf_search="$cf_search /opt/video/lib/video"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/video &&       cf_search="$cf_search $cf_subdir_prefix/lib/video"
+	test -d $cf_subdir_prefix/lib/video/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/video/lib"
+	test -d $cf_subdir_prefix/video/lib &&       cf_search="$cf_search $cf_subdir_prefix/video/lib"
+	test -d $cf_subdir_prefix/video/lib/video &&    cf_search="$cf_search $cf_subdir_prefix/video/lib/video"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/video &&       cf_search="$cf_search $HOME/lib/video"
-	test -d $HOME/lib/video/lib &&    cf_search="$cf_search $HOME/lib/video/lib"
-	test -d $HOME/video/lib &&       cf_search="$cf_search $HOME/video/lib"
-	test -d $HOME/video/lib/video &&    cf_search="$cf_search $HOME/video/lib/video"
-}
+done
 
 cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25430: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:24880: 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 25434 "configure"
+#line 24884 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -25443,25 +24893,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24896: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25449: \$? = $ac_status" >&5
+  echo "$as_me:24899: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25455: \$? = $ac_status" >&5
+  echo "$as_me:24905: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25457: result: yes" >&5
+  echo "$as_me:24907: 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:25464: result: no" >&5
+echo "$as_me:24914: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25476,7 +24926,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:25479: error: Cannot link video library" >&5
+	{ { echo "$as_me:24929: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25486,13 +24936,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang2'=no'
 	cf_libdir=""
-	echo "$as_me:25489: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:24939: 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 25495 "configure"
+#line 24945 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -25523,16 +24973,16 @@ f = SLtt_get_screen_size; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25526: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24976: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25529: \$? = $ac_status" >&5
+  echo "$as_me:24979: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25535: \$? = $ac_status" >&5
+  echo "$as_me:24985: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -25542,18 +24992,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:25545: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:24995: 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_'slang2'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:25552: checking for SLtt_get_screen_size in -lslang2" >&5
+		echo "$as_me:25002: checking for SLtt_get_screen_size in -lslang2" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size in -lslang2... $ECHO_C" >&6
 		LIBS="-lslang2 $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 25556 "configure"
+#line 25006 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25565,25 +25015,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25018: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25571: \$? = $ac_status" >&5
+  echo "$as_me:25021: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25577: \$? = $ac_status" >&5
+  echo "$as_me:25027: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25579: result: yes" >&5
+  echo "$as_me:25029: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'slang2'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:25586: result: no" >&5
+echo "$as_me:25036: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -25614,17 +25064,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/slang2 &&       cf_search="$cf_search /usr/lib/slang2"
-	test -d /usr/lib/slang2/lib &&    cf_search="$cf_search /usr/lib/slang2/lib"
-	test -d /usr/slang2/lib &&       cf_search="$cf_search /usr/slang2/lib"
-	test -d /usr/slang2/lib/slang2 &&    cf_search="$cf_search /usr/slang2/lib/slang2"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -25636,48 +25075,37 @@ test -d "$prefix" && \
 	test -d $prefix/slang2/lib/slang2 &&    cf_search="$cf_search $prefix/slang2/lib/slang2"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/slang2 &&       cf_search="$cf_search /usr/local/lib/slang2"
-	test -d /usr/local/lib/slang2/lib &&    cf_search="$cf_search /usr/local/lib/slang2/lib"
-	test -d /usr/local/slang2/lib &&       cf_search="$cf_search /usr/local/slang2/lib"
-	test -d /usr/local/slang2/lib/slang2 &&    cf_search="$cf_search /usr/local/slang2/lib/slang2"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/slang2 &&       cf_search="$cf_search /opt/lib/slang2"
-	test -d /opt/lib/slang2/lib &&    cf_search="$cf_search /opt/lib/slang2/lib"
-	test -d /opt/slang2/lib &&       cf_search="$cf_search /opt/slang2/lib"
-	test -d /opt/slang2/lib/slang2 &&    cf_search="$cf_search /opt/slang2/lib/slang2"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/slang2 &&       cf_search="$cf_search $cf_subdir_prefix/lib/slang2"
+	test -d $cf_subdir_prefix/lib/slang2/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/slang2/lib"
+	test -d $cf_subdir_prefix/slang2/lib &&       cf_search="$cf_search $cf_subdir_prefix/slang2/lib"
+	test -d $cf_subdir_prefix/slang2/lib/slang2 &&    cf_search="$cf_search $cf_subdir_prefix/slang2/lib/slang2"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/slang2 &&       cf_search="$cf_search $HOME/lib/slang2"
-	test -d $HOME/lib/slang2/lib &&    cf_search="$cf_search $HOME/lib/slang2/lib"
-	test -d $HOME/slang2/lib &&       cf_search="$cf_search $HOME/slang2/lib"
-	test -d $HOME/slang2/lib/slang2 &&    cf_search="$cf_search $HOME/slang2/lib/slang2"
-}
+done
 
 cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25676: checking for -lslang2 in $cf_libdir" >&5
+				echo "$as_me:25104: checking for -lslang2 in $cf_libdir" >&5
 echo $ECHO_N "checking for -lslang2 in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lslang2 $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 25680 "configure"
+#line 25108 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25689,25 +25117,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25692: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25120: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25695: \$? = $ac_status" >&5
+  echo "$as_me:25123: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25698: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25701: \$? = $ac_status" >&5
+  echo "$as_me:25129: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25703: result: yes" >&5
+  echo "$as_me:25131: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'slang2'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:25710: result: no" >&5
+echo "$as_me:25138: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25722,13 +25150,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang2
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:25725: error: Cannot link slang2 library" >&5
+	{ { echo "$as_me:25153: error: Cannot link slang2 library" >&5
 echo "$as_me: error: Cannot link slang2 library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 cf_slang_LIBS3="$LIBS"
-echo "$as_me:25731: checking if we can link slang2 without termcap" >&5
+echo "$as_me:25159: checking if we can link slang2 without termcap" >&5
 echo $ECHO_N "checking if we can link slang2 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%^.%%'`
@@ -25737,7 +25165,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 25740 "configure"
+#line 25168 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25749,16 +25177,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25752: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25755: \$? = $ac_status" >&5
+  echo "$as_me:25183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25761: \$? = $ac_status" >&5
+  echo "$as_me:25189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -25767,12 +25195,12 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:25770: result: $cf_result" >&5
+echo "$as_me:25198: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 	else
-		{ { echo "$as_me:25775: error: cannot find slang headers" >&5
+		{ { echo "$as_me:25203: error: cannot find slang headers" >&5
 echo "$as_me: error: cannot find slang headers" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -25780,14 +25208,14 @@ fi
 
 # 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:25783: checking if we must define UTF8" >&5
+echo "$as_me:25211: 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 25790 "configure"
+#line 25218 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25799,16 +25227,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25802: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25230: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25805: \$? = $ac_status" >&5
+  echo "$as_me:25233: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25811: \$? = $ac_status" >&5
+  echo "$as_me:25239: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -25816,7 +25244,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25819 "configure"
+#line 25247 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -25830,16 +25258,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25833: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25261: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25836: \$? = $ac_status" >&5
+  echo "$as_me:25264: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25839: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25842: \$? = $ac_status" >&5
+  echo "$as_me:25270: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -25852,7 +25280,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:25855: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:25283: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -25863,14 +25291,14 @@ EOF
 
 fi
 
-echo "$as_me:25866: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:25294: 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 25873 "configure"
+#line 25301 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25889,16 +25317,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25892: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25320: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25895: \$? = $ac_status" >&5
+  echo "$as_me:25323: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25901: \$? = $ac_status" >&5
+  echo "$as_me:25329: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -25909,20 +25337,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:25912: result: $cf_cv_slang_unix" >&5
+echo "$as_me:25340: 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
 EOF
 
-	echo "$as_me:25919: checking for SLsmg_Color_Type" >&5
+	echo "$as_me:25347: checking for SLsmg_Color_Type" >&5
 echo $ECHO_N "checking for SLsmg_Color_Type... $ECHO_C" >&6
 if test "${ac_cv_type_SLsmg_Color_Type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25925 "configure"
+#line 25353 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -25938,16 +25366,16 @@ if (sizeof (SLsmg_Color_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25941: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25369: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25944: \$? = $ac_status" >&5
+  echo "$as_me:25372: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25950: \$? = $ac_status" >&5
+  echo "$as_me:25378: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLsmg_Color_Type=yes
 else
@@ -25957,7 +25385,7 @@ ac_cv_type_SLsmg_Color_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25960: result: $ac_cv_type_SLsmg_Color_Type" >&5
+echo "$as_me:25388: result: $ac_cv_type_SLsmg_Color_Type" >&5
 echo "${ECHO_T}$ac_cv_type_SLsmg_Color_Type" >&6
 if test $ac_cv_type_SLsmg_Color_Type = yes; then
   ac_cv_type_SLsmg_Color_Type=yes
@@ -25973,13 +25401,13 @@ EOF
 
 fi
 
-	echo "$as_me:25976: checking for SLtt_Char_Type" >&5
+	echo "$as_me:25404: checking for SLtt_Char_Type" >&5
 echo $ECHO_N "checking for SLtt_Char_Type... $ECHO_C" >&6
 if test "${ac_cv_type_SLtt_Char_Type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25982 "configure"
+#line 25410 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -25995,16 +25423,16 @@ if (sizeof (SLtt_Char_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25998: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26001: \$? = $ac_status" >&5
+  echo "$as_me:25429: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26007: \$? = $ac_status" >&5
+  echo "$as_me:25435: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLtt_Char_Type=yes
 else
@@ -26014,7 +25442,7 @@ ac_cv_type_SLtt_Char_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26017: result: $ac_cv_type_SLtt_Char_Type" >&5
+echo "$as_me:25445: result: $ac_cv_type_SLtt_Char_Type" >&5
 echo "${ECHO_T}$ac_cv_type_SLtt_Char_Type" >&6
 if test $ac_cv_type_SLtt_Char_Type = yes; then
   ac_cv_type_SLtt_Char_Type=yes
@@ -26034,14 +25462,14 @@ fi
 	;;
 esac
 
-echo "$as_me:26037: checking for chtype typedef" >&5
+echo "$as_me:25465: checking for chtype typedef" >&5
 echo $ECHO_N "checking for chtype typedef... $ECHO_C" >&6
 if test "${cf_cv_chtype_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 26044 "configure"
+#line 25472 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -26053,16 +25481,16 @@ chtype foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26056: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25484: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26059: \$? = $ac_status" >&5
+  echo "$as_me:25487: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26065: \$? = $ac_status" >&5
+  echo "$as_me:25493: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -26072,7 +25500,7 @@ cf_cv_chtype_decl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26075: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:25503: result: $cf_cv_chtype_decl" >&5
 echo "${ECHO_T}$cf_cv_chtype_decl" >&6
 if test $cf_cv_chtype_decl = yes ; then
 
@@ -26080,14 +25508,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_CHTYPE 1
 EOF
 
-	echo "$as_me:26083: checking if chtype is scalar or struct" >&5
+	echo "$as_me:25511: checking if chtype is scalar or struct" >&5
 echo $ECHO_N "checking if chtype is scalar or struct... $ECHO_C" >&6
 if test "${cf_cv_chtype_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 26090 "configure"
+#line 25518 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -26099,16 +25527,16 @@ chtype foo; long x = foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26102: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25530: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26105: \$? = $ac_status" >&5
+  echo "$as_me:25533: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26111: \$? = $ac_status" >&5
+  echo "$as_me:25539: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -26118,7 +25546,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26121: result: $cf_cv_chtype_type" >&5
+echo "$as_me:25549: result: $cf_cv_chtype_type" >&5
 echo "${ECHO_T}$cf_cv_chtype_type" >&6
 	if test $cf_cv_chtype_type = scalar ; then
 
@@ -26129,7 +25557,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26132: checking if you want the wide-curses features" >&5
+echo "$as_me:25560: 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.
@@ -26146,10 +25574,10 @@ else
   use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:26149: result: $use_wide_curses" >&5
+echo "$as_me:25577: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:26152: checking if color-style code should be used" >&5
+echo "$as_me:25580: 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.
@@ -26169,7 +25597,7 @@ fi;
 
 case $use_color_style in
 no)
-	echo "$as_me:26172: result: no" >&5
+	echo "$as_me:25600: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -26179,10 +25607,10 @@ cat >>confdefs.h <<\EOF
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:26182: result: yes" >&5
+	echo "$as_me:25610: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:26185: checking for location of style-sheet file" >&5
+	echo "$as_me:25613: 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.
@@ -26218,7 +25646,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:26221: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:25649: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -26227,7 +25655,7 @@ esac
 fi
 eval LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:26230: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:25658: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -26240,7 +25668,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:26243: checking for the default configuration-file" >&5
+echo "$as_me:25671: 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.
@@ -26276,7 +25704,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:26279: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:25707: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -26285,7 +25713,7 @@ esac
 fi
 eval LYNX_CFG_FILE="$withval"
 
-echo "$as_me:26288: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:25716: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -26294,7 +25722,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:26297: checking for the default configuration-path" >&5
+echo "$as_me:25725: checking for the default configuration-path" >&5
 echo $ECHO_N "checking for the default configuration-path... $ECHO_C" >&6
 
 # Check whether --with-cfg-path or --without-cfg-path was given.
@@ -26330,7 +25758,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:26333: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:25761: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -26339,7 +25767,7 @@ esac
 fi
 eval LYNX_CFG_PATH="$withval"
 
-echo "$as_me:26342: result: $LYNX_CFG_PATH" >&5
+echo "$as_me:25770: result: $LYNX_CFG_PATH" >&5
 echo "${ECHO_T}$LYNX_CFG_PATH" >&6
 
 test -z "$LYNX_CFG_PATH" && `echo "$LYNX_CFG_FILE" | sed -e 's%/[^/]*$%%'`
@@ -26349,7 +25777,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_PATH "$LYNX_CFG_PATH"
 EOF
 
-echo "$as_me:26352: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:25780: 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.
@@ -26366,7 +25794,7 @@ else
   use_htmlized_cfg=no
 
 fi;
-echo "$as_me:26369: result: $use_htmlized_cfg" >&5
+echo "$as_me:25797: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -26374,7 +25802,7 @@ if test $use_htmlized_cfg = no ; then
 	LYNXCFG_MAKE='#'
 fi
 
-echo "$as_me:26377: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:25805: 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.
@@ -26391,7 +25819,7 @@ else
   use_local_docs=no
 
 fi;
-echo "$as_me:26394: result: $use_local_docs" >&5
+echo "$as_me:25822: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -26399,7 +25827,7 @@ if test $use_local_docs = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:26402: checking for MIME library directory" >&5
+echo "$as_me:25830: 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.
@@ -26435,7 +25863,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:26438: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:25866: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -26444,7 +25872,7 @@ esac
 fi
 eval MIME_LIBDIR="$withval"
 
-echo "$as_me:26447: result: $MIME_LIBDIR" >&5
+echo "$as_me:25875: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 
@@ -26452,7 +25880,7 @@ cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:26455: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:25883: 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.
@@ -26469,7 +25897,7 @@ else
   use_locale_charset=yes
 
 fi;
-echo "$as_me:26472: result: $use_locale_charset" >&5
+echo "$as_me:25900: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test $use_locale_charset != no &&
 cat >>confdefs.h <<\EOF
@@ -26478,7 +25906,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:26481: checking if you want only a few charsets" >&5
+echo "$as_me:25909: 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.
@@ -26490,7 +25918,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:26493: result: yes" >&5
+	echo "$as_me:25921: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -26504,7 +25932,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}:26507: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me:-configure}:25935: 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'`
@@ -26531,28 +25959,28 @@ echo "${as_me:-configure}:26507: testing using minimal list of charsets: $cf_min
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me:-configure}:26534: testing found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:25962: 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}:26540: testing not found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:25968: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:26545: result: no" >&5
+	echo "$as_me:25973: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26549: checking for ANSI C header files" >&5
+echo "$as_me:25977: 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 26555 "configure"
+#line 25983 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -26560,13 +25988,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:26563: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:25991: \"$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:26569: \$? = $ac_status" >&5
+  echo "$as_me:25997: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26588,7 +26016,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 26591 "configure"
+#line 26019 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -26606,7 +26034,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 26609 "configure"
+#line 26037 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -26627,7 +26055,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26630 "configure"
+#line 26058 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -26653,15 +26081,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26656: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26084: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26659: \$? = $ac_status" >&5
+  echo "$as_me:26087: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26661: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26089: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26664: \$? = $ac_status" >&5
+  echo "$as_me:26092: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26674,7 +26102,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:26677: result: $ac_cv_header_stdc" >&5
+echo "$as_me:26105: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -26684,13 +26112,13 @@ EOF
 
 fi
 
-echo "$as_me:26687: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:26115: 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 26693 "configure"
+#line 26121 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -26706,16 +26134,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26709: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26137: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26712: \$? = $ac_status" >&5
+  echo "$as_me:26140: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26143: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26718: \$? = $ac_status" >&5
+  echo "$as_me:26146: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -26725,7 +26153,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26728: result: $ac_cv_header_time" >&5
+echo "$as_me:26156: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -26738,13 +26166,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:26741: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:26169: 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 26747 "configure"
+#line 26175 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -26759,16 +26187,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26762: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26190: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26765: \$? = $ac_status" >&5
+  echo "$as_me:26193: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26196: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26771: \$? = $ac_status" >&5
+  echo "$as_me:26199: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -26778,7 +26206,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26781: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26209: 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
@@ -26791,7 +26219,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:26794: checking for opendir in -ldir" >&5
+  echo "$as_me:26222: 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
@@ -26799,7 +26227,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 26802 "configure"
+#line 26230 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -26818,16 +26246,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26821: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26249: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26824: \$? = $ac_status" >&5
+  echo "$as_me:26252: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26830: \$? = $ac_status" >&5
+  echo "$as_me:26258: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -26838,14 +26266,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:26841: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:26269: 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:26848: checking for opendir in -lx" >&5
+  echo "$as_me:26276: 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
@@ -26853,7 +26281,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 26856 "configure"
+#line 26284 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -26872,16 +26300,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26875: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26303: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26878: \$? = $ac_status" >&5
+  echo "$as_me:26306: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26309: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26884: \$? = $ac_status" >&5
+  echo "$as_me:26312: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -26892,7 +26320,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:26895: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:26323: 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"
@@ -26920,23 +26348,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26923: checking for $ac_header" >&5
+echo "$as_me:26351: 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 26929 "configure"
+#line 26357 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26933: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26361: \"$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:26939: \$? = $ac_status" >&5
+  echo "$as_me:26367: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26955,7 +26383,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26958: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26386: 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
@@ -26965,14 +26393,14 @@ EOF
 fi
 done
 
-echo "$as_me:26968: checking termio.h and termios.h" >&5
+echo "$as_me:26396: 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 26975 "configure"
+#line 26403 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -26990,16 +26418,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26993: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26421: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26996: \$? = $ac_status" >&5
+  echo "$as_me:26424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27002: \$? = $ac_status" >&5
+  echo "$as_me:26430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -27010,21 +26438,21 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:27013: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:26441: 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:27020: checking for sigaction and structs" >&5
+echo "$as_me:26448: 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 27027 "configure"
+#line 26455 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27044,16 +26472,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26475: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27050: \$? = $ac_status" >&5
+  echo "$as_me:26478: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27056: \$? = $ac_status" >&5
+  echo "$as_me:26484: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -27064,7 +26492,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:27067: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:26495: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes &&
 cat >>confdefs.h <<\EOF
@@ -27074,23 +26502,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:27077: checking for $ac_header" >&5
+echo "$as_me:26505: 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 27083 "configure"
+#line 26511 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:27087: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26515: \"$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:27093: \$? = $ac_status" >&5
+  echo "$as_me:26521: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27109,7 +26537,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27112: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26540: 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
@@ -27130,23 +26558,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:27133: checking for $ac_header" >&5
+echo "$as_me:26561: 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 27139 "configure"
+#line 26567 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:27143: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26571: \"$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:27149: \$? = $ac_status" >&5
+  echo "$as_me:26577: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27165,7 +26593,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27168: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26596: 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
@@ -27178,23 +26606,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:27181: checking for $ac_header" >&5
+echo "$as_me:26609: 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 27187 "configure"
+#line 26615 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:27191: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26619: \"$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:27197: \$? = $ac_status" >&5
+  echo "$as_me:26625: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27213,7 +26641,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27216: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26644: 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
@@ -27235,14 +26663,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:27238: checking for union wait" >&5
+echo "$as_me:26666: 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 27245 "configure"
+#line 26673 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -27258,16 +26686,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27261: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26689: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27264: \$? = $ac_status" >&5
+  echo "$as_me:26692: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27270: \$? = $ac_status" >&5
+  echo "$as_me:26698: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -27277,7 +26705,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 27280 "configure"
+#line 26708 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -27297,16 +26725,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27300: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26728: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27303: \$? = $ac_status" >&5
+  echo "$as_me:26731: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27309: \$? = $ac_status" >&5
+  echo "$as_me:26737: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -27321,7 +26749,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:27324: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:26752: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test $cf_cv_type_unionwait = yes &&
 cat >>confdefs.h <<\EOF
@@ -27330,14 +26758,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:27333: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:26761: 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 27340 "configure"
+#line 26768 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -27349,16 +26777,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27352: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26780: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27355: \$? = $ac_status" >&5
+  echo "$as_me:26783: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27361: \$? = $ac_status" >&5
+  echo "$as_me:26789: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -27370,21 +26798,21 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:27373: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:26801: 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:27380: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:26808: 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 27387 "configure"
+#line 26815 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -27396,16 +26824,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27399: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26827: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27402: \$? = $ac_status" >&5
+  echo "$as_me:26830: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27405: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27408: \$? = $ac_status" >&5
+  echo "$as_me:26836: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -27417,7 +26845,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:27420: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:26848: 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
@@ -27426,13 +26854,13 @@ EOF
 
 fi
 
-echo "$as_me:27429: checking for uid_t in sys/types.h" >&5
+echo "$as_me:26857: 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 27435 "configure"
+#line 26863 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -27446,7 +26874,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:27449: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:26877: 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
 
@@ -27460,7 +26888,7 @@ EOF
 
 fi
 
-echo "$as_me:27463: checking type of array argument to getgroups" >&5
+echo "$as_me:26891: 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
@@ -27469,7 +26897,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27472 "configure"
+#line 26900 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -27495,15 +26923,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27498: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26926: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27501: \$? = $ac_status" >&5
+  echo "$as_me:26929: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26931: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27506: \$? = $ac_status" >&5
+  echo "$as_me:26934: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -27516,7 +26944,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 27519 "configure"
+#line 26947 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -27531,20 +26959,20 @@ rm -rf conftest*
 
 fi
 fi
-echo "$as_me:27534: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:26962: 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:27541: checking for off_t" >&5
+echo "$as_me:26969: 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 27547 "configure"
+#line 26975 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27559,16 +26987,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27562: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26990: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27565: \$? = $ac_status" >&5
+  echo "$as_me:26993: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27568: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27571: \$? = $ac_status" >&5
+  echo "$as_me:26999: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -27578,7 +27006,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27581: result: $ac_cv_type_off_t" >&5
+echo "$as_me:27009: 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
   :
@@ -27590,13 +27018,13 @@ EOF
 
 fi
 
-echo "$as_me:27593: checking for pid_t" >&5
+echo "$as_me:27021: 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 27599 "configure"
+#line 27027 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27611,16 +27039,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27042: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27617: \$? = $ac_status" >&5
+  echo "$as_me:27045: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27623: \$? = $ac_status" >&5
+  echo "$as_me:27051: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -27630,7 +27058,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27633: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:27061: 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
   :
@@ -27642,13 +27070,13 @@ EOF
 
 fi
 
-echo "$as_me:27645: checking for uid_t in sys/types.h" >&5
+echo "$as_me:27073: 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 27651 "configure"
+#line 27079 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -27662,7 +27090,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:27665: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:27093: 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
 
@@ -27676,13 +27104,13 @@ EOF
 
 fi
 
-echo "$as_me:27679: checking for mode_t" >&5
+echo "$as_me:27107: 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 27685 "configure"
+#line 27113 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27697,16 +27125,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27700: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27128: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27703: \$? = $ac_status" >&5
+  echo "$as_me:27131: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27709: \$? = $ac_status" >&5
+  echo "$as_me:27137: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -27716,7 +27144,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27719: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:27147: 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
   :
@@ -27728,13 +27156,13 @@ EOF
 
 fi
 
-	echo "$as_me:27731: checking for ssize_t" >&5
+	echo "$as_me:27159: checking for ssize_t" >&5
 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
 if test "${ac_cv_type_ssize_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27737 "configure"
+#line 27165 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27749,16 +27177,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27752: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27180: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27755: \$? = $ac_status" >&5
+  echo "$as_me:27183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27761: \$? = $ac_status" >&5
+  echo "$as_me:27189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -27768,7 +27196,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27771: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:27199: result: $ac_cv_type_ssize_t" >&5
 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
 if test $ac_cv_type_ssize_t = yes; then
   ac_cv_type_ssize_t=yes
@@ -27784,13 +27212,13 @@ EOF
 
 fi
 
-	echo "$as_me:27787: checking for socklen_t" >&5
+	echo "$as_me:27215: 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 27793 "configure"
+#line 27221 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27808,16 +27236,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27811: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27239: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27814: \$? = $ac_status" >&5
+  echo "$as_me:27242: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27820: \$? = $ac_status" >&5
+  echo "$as_me:27248: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -27827,7 +27255,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27830: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:27258: 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
@@ -27843,7 +27271,7 @@ EOF
 
 fi
 
-echo "$as_me:27846: checking for long long type" >&5
+echo "$as_me:27274: checking for long long type" >&5
 echo $ECHO_N "checking for long long type... $ECHO_C" >&6
 if test "${cf_cv_type_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27874,7 +27302,7 @@ _CFEOF
 	rm -f conftest*
 
 fi
-echo "$as_me:27877: result: $cf_cv_type_long_long" >&5
+echo "$as_me:27305: result: $cf_cv_type_long_long" >&5
 echo "${ECHO_T}$cf_cv_type_long_long" >&6
 
 if test "$cf_cv_type_long_long" = yes ; then
@@ -27885,14 +27313,14 @@ EOF
 
 fi
 
-echo "$as_me:27888: checking for tm.tm_gmtoff" >&5
+echo "$as_me:27316: checking for tm.tm_gmtoff" >&5
 echo $ECHO_N "checking for tm.tm_gmtoff... $ECHO_C" >&6
 if test "${cf_cv_tm_gmtoff+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 27895 "configure"
+#line 27323 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -27917,16 +27345,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27920: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27348: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27923: \$? = $ac_status" >&5
+  echo "$as_me:27351: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27929: \$? = $ac_status" >&5
+  echo "$as_me:27357: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -27937,20 +27365,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:27940: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:27368: result: $cf_cv_tm_gmtoff" >&5
 echo "${ECHO_T}$cf_cv_tm_gmtoff" >&6
 test $cf_cv_tm_gmtoff = no &&
 cat >>confdefs.h <<\EOF
 #define DONT_HAVE_TM_GMTOFF 1
 EOF
 
-echo "$as_me:27947: checking for int" >&5
+echo "$as_me:27375: checking for int" >&5
 echo $ECHO_N "checking for int... $ECHO_C" >&6
 if test "${ac_cv_type_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27953 "configure"
+#line 27381 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27965,16 +27393,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27968: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27396: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27971: \$? = $ac_status" >&5
+  echo "$as_me:27399: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27977: \$? = $ac_status" >&5
+  echo "$as_me:27405: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -27984,10 +27412,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27987: result: $ac_cv_type_int" >&5
+echo "$as_me:27415: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:27990: checking size of int" >&5
+echo "$as_me:27418: checking size of int" >&5
 echo $ECHO_N "checking size of int... $ECHO_C" >&6
 if test "${ac_cv_sizeof_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27996,7 +27424,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 27999 "configure"
+#line 27427 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28008,21 +27436,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28011: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27439: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28014: \$? = $ac_status" >&5
+  echo "$as_me:27442: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28020: \$? = $ac_status" >&5
+  echo "$as_me:27448: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28025 "configure"
+#line 27453 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28034,16 +27462,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28037: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27465: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28040: \$? = $ac_status" >&5
+  echo "$as_me:27468: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28046: \$? = $ac_status" >&5
+  echo "$as_me:27474: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28059,7 +27487,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28062 "configure"
+#line 27490 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28071,16 +27499,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28074: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27502: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28077: \$? = $ac_status" >&5
+  echo "$as_me:27505: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28083: \$? = $ac_status" >&5
+  echo "$as_me:27511: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28096,7 +27524,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 28099 "configure"
+#line 27527 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28108,16 +27536,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28111: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27539: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28114: \$? = $ac_status" >&5
+  echo "$as_me:27542: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28120: \$? = $ac_status" >&5
+  echo "$as_me:27548: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28130,12 +27558,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28133: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27561: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28138 "configure"
+#line 27566 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28151,15 +27579,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28154: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27582: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28157: \$? = $ac_status" >&5
+  echo "$as_me:27585: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28162: \$? = $ac_status" >&5
+  echo "$as_me:27590: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -28175,7 +27603,7 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:28178: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:27606: result: $ac_cv_sizeof_int" >&5
 echo "${ECHO_T}$ac_cv_sizeof_int" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_INT $ac_cv_sizeof_int
@@ -28183,23 +27611,23 @@ EOF
 
 if test "${ac_cv_type_int:+set}" = set; then
 	if test "${ac_cv_sizeof_int:+set}" != set; then
-		{ echo "$as_me:28186: WARNING: using 4 for sizeof int" >&5
+		{ echo "$as_me:27614: WARNING: using 4 for sizeof int" >&5
 echo "$as_me: WARNING: using 4 for sizeof int" >&2;}
 		ac_cv_sizeof_int=4
 	elif test "x${ac_cv_sizeof_int}" = x0; then
-		{ echo "$as_me:28190: WARNING: sizeof int not found, using 4" >&5
+		{ echo "$as_me:27618: WARNING: sizeof int not found, using 4" >&5
 echo "$as_me: WARNING: sizeof int not found, using 4" >&2;}
 		ac_cv_sizeof_int=4
 	fi
 fi
 
-echo "$as_me:28196: checking for long" >&5
+echo "$as_me:27624: checking for long" >&5
 echo $ECHO_N "checking for long... $ECHO_C" >&6
 if test "${ac_cv_type_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28202 "configure"
+#line 27630 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28214,16 +27642,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28217: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27645: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28220: \$? = $ac_status" >&5
+  echo "$as_me:27648: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28223: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28226: \$? = $ac_status" >&5
+  echo "$as_me:27654: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -28233,10 +27661,10 @@ ac_cv_type_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28236: result: $ac_cv_type_long" >&5
+echo "$as_me:27664: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:28239: checking size of long" >&5
+echo "$as_me:27667: checking size of long" >&5
 echo $ECHO_N "checking size of long... $ECHO_C" >&6
 if test "${ac_cv_sizeof_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28245,7 +27673,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28248 "configure"
+#line 27676 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28257,21 +27685,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28260: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27688: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28263: \$? = $ac_status" >&5
+  echo "$as_me:27691: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27694: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28269: \$? = $ac_status" >&5
+  echo "$as_me:27697: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28274 "configure"
+#line 27702 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28283,16 +27711,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28286: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27714: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28289: \$? = $ac_status" >&5
+  echo "$as_me:27717: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27720: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28295: \$? = $ac_status" >&5
+  echo "$as_me:27723: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28308,7 +27736,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28311 "configure"
+#line 27739 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28320,16 +27748,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28323: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27751: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28326: \$? = $ac_status" >&5
+  echo "$as_me:27754: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28332: \$? = $ac_status" >&5
+  echo "$as_me:27760: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28345,7 +27773,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 28348 "configure"
+#line 27776 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28357,16 +27785,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28360: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27788: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28363: \$? = $ac_status" >&5
+  echo "$as_me:27791: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27794: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28369: \$? = $ac_status" >&5
+  echo "$as_me:27797: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28379,12 +27807,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28382: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27810: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28387 "configure"
+#line 27815 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28400,15 +27828,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28403: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27831: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28406: \$? = $ac_status" >&5
+  echo "$as_me:27834: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28411: \$? = $ac_status" >&5
+  echo "$as_me:27839: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -28424,7 +27852,7 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:28427: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:27855: result: $ac_cv_sizeof_long" >&5
 echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_LONG $ac_cv_sizeof_long
@@ -28432,23 +27860,23 @@ EOF
 
 if test "${ac_cv_type_long:+set}" = set; then
 	if test "${ac_cv_sizeof_long:+set}" != set; then
-		{ echo "$as_me:28435: WARNING: using 4 for sizeof long" >&5
+		{ echo "$as_me:27863: WARNING: using 4 for sizeof long" >&5
 echo "$as_me: WARNING: using 4 for sizeof long" >&2;}
 		ac_cv_sizeof_long=4
 	elif test "x${ac_cv_sizeof_long}" = x0; then
-		{ echo "$as_me:28439: WARNING: sizeof long not found, using 4" >&5
+		{ echo "$as_me:27867: WARNING: sizeof long not found, using 4" >&5
 echo "$as_me: WARNING: sizeof long not found, using 4" >&2;}
 		ac_cv_sizeof_long=4
 	fi
 fi
 
-echo "$as_me:28445: checking for off_t" >&5
+echo "$as_me:27873: 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 28451 "configure"
+#line 27879 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28463,16 +27891,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28466: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27894: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28469: \$? = $ac_status" >&5
+  echo "$as_me:27897: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28475: \$? = $ac_status" >&5
+  echo "$as_me:27903: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -28482,10 +27910,10 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28485: result: $ac_cv_type_off_t" >&5
+echo "$as_me:27913: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:28488: checking size of off_t" >&5
+echo "$as_me:27916: checking size of off_t" >&5
 echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
 if test "${ac_cv_sizeof_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28494,7 +27922,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28497 "configure"
+#line 27925 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28506,21 +27934,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28509: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27937: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28512: \$? = $ac_status" >&5
+  echo "$as_me:27940: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28518: \$? = $ac_status" >&5
+  echo "$as_me:27946: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28523 "configure"
+#line 27951 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28532,16 +27960,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28535: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27963: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28538: \$? = $ac_status" >&5
+  echo "$as_me:27966: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28541: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28544: \$? = $ac_status" >&5
+  echo "$as_me:27972: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28557,7 +27985,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28560 "configure"
+#line 27988 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28569,16 +27997,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28572: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28000: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28575: \$? = $ac_status" >&5
+  echo "$as_me:28003: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28006: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28581: \$? = $ac_status" >&5
+  echo "$as_me:28009: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28594,7 +28022,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 28597 "configure"
+#line 28025 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28606,16 +28034,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28609: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28037: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28612: \$? = $ac_status" >&5
+  echo "$as_me:28040: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28618: \$? = $ac_status" >&5
+  echo "$as_me:28046: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28628,12 +28056,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28631: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28059: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28636 "configure"
+#line 28064 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28649,15 +28077,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28652: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28080: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28655: \$? = $ac_status" >&5
+  echo "$as_me:28083: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28660: \$? = $ac_status" >&5
+  echo "$as_me:28088: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -28673,7 +28101,7 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:28676: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:28104: result: $ac_cv_sizeof_off_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_OFF_T $ac_cv_sizeof_off_t
@@ -28681,23 +28109,23 @@ EOF
 
 if test "${ac_cv_type_off_t:+set}" = set; then
 	if test "${ac_cv_sizeof_off_t:+set}" != set; then
-		{ echo "$as_me:28684: WARNING: using 4 for sizeof off_t" >&5
+		{ echo "$as_me:28112: WARNING: using 4 for sizeof off_t" >&5
 echo "$as_me: WARNING: using 4 for sizeof off_t" >&2;}
 		ac_cv_sizeof_off_t=4
 	elif test "x${ac_cv_sizeof_off_t}" = x0; then
-		{ echo "$as_me:28688: WARNING: sizeof off_t not found, using 4" >&5
+		{ echo "$as_me:28116: WARNING: sizeof off_t not found, using 4" >&5
 echo "$as_me: WARNING: sizeof off_t not found, using 4" >&2;}
 		ac_cv_sizeof_off_t=4
 	fi
 fi
 
-echo "$as_me:28694: checking for time_t" >&5
+echo "$as_me:28122: checking for time_t" >&5
 echo $ECHO_N "checking for time_t... $ECHO_C" >&6
 if test "${ac_cv_type_time_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28700 "configure"
+#line 28128 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28712,16 +28140,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28715: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28143: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28718: \$? = $ac_status" >&5
+  echo "$as_me:28146: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28724: \$? = $ac_status" >&5
+  echo "$as_me:28152: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -28731,10 +28159,10 @@ ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28734: result: $ac_cv_type_time_t" >&5
+echo "$as_me:28162: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:28737: checking size of time_t" >&5
+echo "$as_me:28165: checking size of time_t" >&5
 echo $ECHO_N "checking size of time_t... $ECHO_C" >&6
 if test "${ac_cv_sizeof_time_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28743,7 +28171,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28746 "configure"
+#line 28174 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28755,21 +28183,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28758: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28186: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28761: \$? = $ac_status" >&5
+  echo "$as_me:28189: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28192: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28767: \$? = $ac_status" >&5
+  echo "$as_me:28195: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28772 "configure"
+#line 28200 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28781,16 +28209,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28784: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28212: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28787: \$? = $ac_status" >&5
+  echo "$as_me:28215: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28790: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28218: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28793: \$? = $ac_status" >&5
+  echo "$as_me:28221: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28806,7 +28234,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28809 "configure"
+#line 28237 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28818,16 +28246,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28821: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28249: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28824: \$? = $ac_status" >&5
+  echo "$as_me:28252: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28830: \$? = $ac_status" >&5
+  echo "$as_me:28258: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28843,7 +28271,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 28846 "configure"
+#line 28274 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28855,16 +28283,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28858: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28286: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28861: \$? = $ac_status" >&5
+  echo "$as_me:28289: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28864: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28867: \$? = $ac_status" >&5
+  echo "$as_me:28295: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28877,12 +28305,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28880: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28308: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28885 "configure"
+#line 28313 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28898,15 +28326,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28901: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28329: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28904: \$? = $ac_status" >&5
+  echo "$as_me:28332: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28909: \$? = $ac_status" >&5
+  echo "$as_me:28337: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -28922,7 +28350,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:28925: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:28353: result: $ac_cv_sizeof_time_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_time_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_TIME_T $ac_cv_sizeof_time_t
@@ -28930,23 +28358,23 @@ EOF
 
 if test "${ac_cv_type_time_t:+set}" = set; then
 	if test "${ac_cv_sizeof_time_t:+set}" != set; then
-		{ echo "$as_me:28933: WARNING: using 4 for sizeof time_t" >&5
+		{ echo "$as_me:28361: WARNING: using 4 for sizeof time_t" >&5
 echo "$as_me: WARNING: using 4 for sizeof time_t" >&2;}
 		ac_cv_sizeof_time_t=4
 	elif test "x${ac_cv_sizeof_time_t}" = x0; then
-		{ echo "$as_me:28937: WARNING: sizeof time_t not found, using 4" >&5
+		{ echo "$as_me:28365: WARNING: sizeof time_t not found, using 4" >&5
 echo "$as_me: WARNING: sizeof time_t not found, using 4" >&2;}
 		ac_cv_sizeof_time_t=4
 	fi
 fi
 
-echo "$as_me:28943: checking for intptr_t" >&5
+echo "$as_me:28371: checking for intptr_t" >&5
 echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
 if test "${ac_cv_type_intptr_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28949 "configure"
+#line 28377 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28961,16 +28389,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28964: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28392: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28967: \$? = $ac_status" >&5
+  echo "$as_me:28395: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28398: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28973: \$? = $ac_status" >&5
+  echo "$as_me:28401: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -28980,7 +28408,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28983: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:28411: result: $ac_cv_type_intptr_t" >&5
 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
 if test $ac_cv_type_intptr_t = yes; then
   :
@@ -28994,13 +28422,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:28997: checking for working alloca.h" >&5
+echo "$as_me:28425: 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 29003 "configure"
+#line 28431 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -29012,16 +28440,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29015: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28443: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29018: \$? = $ac_status" >&5
+  echo "$as_me:28446: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28449: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29024: \$? = $ac_status" >&5
+  echo "$as_me:28452: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -29031,7 +28459,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29034: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:28462: 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
 
@@ -29041,13 +28469,13 @@ EOF
 
 fi
 
-echo "$as_me:29044: checking for alloca" >&5
+echo "$as_me:28472: 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 29050 "configure"
+#line 28478 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -29079,16 +28507,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29082: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28510: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29085: \$? = $ac_status" >&5
+  echo "$as_me:28513: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29091: \$? = $ac_status" >&5
+  echo "$as_me:28519: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -29098,7 +28526,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29101: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:28529: 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
@@ -29119,13 +28547,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:29122: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:28550: 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 29128 "configure"
+#line 28556 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -29143,18 +28571,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:29146: result: $ac_cv_os_cray" >&5
+echo "$as_me:28574: 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:29151: checking for $ac_func" >&5
+echo "$as_me:28579: 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 29157 "configure"
+#line 28585 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29185,16 +28613,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29188: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28616: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29191: \$? = $ac_status" >&5
+  echo "$as_me:28619: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28622: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29197: \$? = $ac_status" >&5
+  echo "$as_me:28625: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29204,7 +28632,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29207: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:28635: 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
 
@@ -29218,7 +28646,7 @@ fi
   done
 fi
 
-echo "$as_me:29221: checking stack direction for C alloca" >&5
+echo "$as_me:28649: 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
@@ -29227,7 +28655,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29230 "configure"
+#line 28658 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -29250,15 +28678,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29253: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28681: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29256: \$? = $ac_status" >&5
+  echo "$as_me:28684: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29261: \$? = $ac_status" >&5
+  echo "$as_me:28689: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -29270,7 +28698,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:29273: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:28701: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -29282,23 +28710,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:29285: checking for $ac_header" >&5
+echo "$as_me:28713: 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 29291 "configure"
+#line 28719 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:29295: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:28723: \"$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:29301: \$? = $ac_status" >&5
+  echo "$as_me:28729: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -29317,7 +28745,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:29320: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:28748: 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
@@ -29330,13 +28758,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29333: checking for $ac_func" >&5
+echo "$as_me:28761: 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 29339 "configure"
+#line 28767 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29367,16 +28795,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29370: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28798: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29373: \$? = $ac_status" >&5
+  echo "$as_me:28801: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29379: \$? = $ac_status" >&5
+  echo "$as_me:28807: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29386,7 +28814,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29389: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:28817: 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
@@ -29398,7 +28826,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:29401: checking for working fork" >&5
+  echo "$as_me:28829: 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
@@ -29421,15 +28849,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29424: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28852: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29427: \$? = $ac_status" >&5
+  echo "$as_me:28855: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29432: \$? = $ac_status" >&5
+  echo "$as_me:28860: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -29441,7 +28869,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:29444: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:28872: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -29455,12 +28883,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:29458: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:28886: 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:29463: checking for working vfork" >&5
+  echo "$as_me:28891: 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
@@ -29469,7 +28897,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29472 "configure"
+#line 28900 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -29566,15 +28994,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29569: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28997: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29572: \$? = $ac_status" >&5
+  echo "$as_me:29000: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29577: \$? = $ac_status" >&5
+  echo "$as_me:29005: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -29586,13 +29014,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:29589: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:29017: 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:29595: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:29023: 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
 
@@ -29617,14 +29045,14 @@ EOF
 
 fi
 
-echo "$as_me:29620: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:29048: 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 29627 "configure"
+#line 29055 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29641,16 +29069,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29644: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29647: \$? = $ac_status" >&5
+  echo "$as_me:29075: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29653: \$? = $ac_status" >&5
+  echo "$as_me:29081: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -29658,7 +29086,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29661 "configure"
+#line 29089 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29680,16 +29108,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29683: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29111: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29686: \$? = $ac_status" >&5
+  echo "$as_me:29114: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29692: \$? = $ac_status" >&5
+  echo "$as_me:29120: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -29702,21 +29130,21 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29705: result: $cf_cv_fionbio" >&5
+echo "$as_me:29133: 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:29712: checking for broken/missing definition of remove" >&5
+echo "$as_me:29140: 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 29719 "configure"
+#line 29147 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29728,23 +29156,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29731: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29159: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29734: \$? = $ac_status" >&5
+  echo "$as_me:29162: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29737: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29740: \$? = $ac_status" >&5
+  echo "$as_me:29168: \$? = $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 29747 "configure"
+#line 29175 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -29757,16 +29185,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29760: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29188: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29763: \$? = $ac_status" >&5
+  echo "$as_me:29191: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29194: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29769: \$? = $ac_status" >&5
+  echo "$as_me:29197: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -29781,21 +29209,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:29784: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:29212: 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:29791: checking for lstat" >&5
+echo "$as_me:29219: 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 29798 "configure"
+#line 29226 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29809,16 +29237,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29240: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29815: \$? = $ac_status" >&5
+  echo "$as_me:29243: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29821: \$? = $ac_status" >&5
+  echo "$as_me:29249: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -29830,7 +29258,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:29833: result: $ac_cv_func_lstat " >&5
+echo "$as_me:29261: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test $ac_cv_func_lstat = yes; then
 
@@ -29865,13 +29293,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29868: checking for $ac_func" >&5
+echo "$as_me:29296: 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 29874 "configure"
+#line 29302 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29902,16 +29330,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29905: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29333: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29908: \$? = $ac_status" >&5
+  echo "$as_me:29336: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29914: \$? = $ac_status" >&5
+  echo "$as_me:29342: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29921,7 +29349,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29924: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29352: 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
@@ -29937,13 +29365,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29940: checking for $ac_func" >&5
+echo "$as_me:29368: 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 29946 "configure"
+#line 29374 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29974,16 +29402,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29977: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29405: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29980: \$? = $ac_status" >&5
+  echo "$as_me:29408: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29986: \$? = $ac_status" >&5
+  echo "$as_me:29414: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29993,7 +29421,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29996: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29424: 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
@@ -30005,7 +29433,7 @@ else
 fi
 done
 
-echo "$as_me:30008: checking for random-integer functions" >&5
+echo "$as_me:29436: 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
@@ -30025,7 +29453,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30028 "configure"
+#line 29456 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30044,16 +29472,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:30047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29475: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30050: \$? = $ac_status" >&5
+  echo "$as_me:29478: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30056: \$? = $ac_status" >&5
+  echo "$as_me:29484: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -30065,10 +29493,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:30068: result: $cf_cv_srand_func" >&5
+echo "$as_me:29496: 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:30071: checking for range of random-integers" >&5
+	echo "$as_me:29499: 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
@@ -30089,7 +29517,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 30092 "configure"
+#line 29520 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30108,16 +29536,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30111: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29539: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30114: \$? = $ac_status" >&5
+  echo "$as_me:29542: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30120: \$? = $ac_status" >&5
+  echo "$as_me:29548: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -30128,15 +29556,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30131: result: $cf_cv_rand_max" >&5
+echo "$as_me:29559: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	case $cf_cv_srand_func in
 	*/arc4random)
-		echo "$as_me:30136: checking if <bsd/stdlib.h> should be included" >&5
+		echo "$as_me:29564: checking if <bsd/stdlib.h> should be included" >&5
 echo $ECHO_N "checking if <bsd/stdlib.h> should be included... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 30139 "configure"
+#line 29567 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -30149,23 +29577,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30152: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29580: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30155: \$? = $ac_status" >&5
+  echo "$as_me:29583: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30158: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30161: \$? = $ac_status" >&5
+  echo "$as_me:29589: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_stdlib_h=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 30168 "configure"
+#line 29596 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -30177,16 +29605,16 @@ unsigned x = arc4random()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30180: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30183: \$? = $ac_status" >&5
+  echo "$as_me:29611: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30189: \$? = $ac_status" >&5
+  echo "$as_me:29617: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_stdlib_h=yes
 else
@@ -30197,7 +29625,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	    echo "$as_me:30200: result: $cf_bsd_stdlib_h" >&5
+	    echo "$as_me:29628: result: $cf_bsd_stdlib_h" >&5
 echo "${ECHO_T}$cf_bsd_stdlib_h" >&6
 		if test "$cf_bsd_stdlib_h" = yes
 		then
@@ -30207,10 +29635,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 		else
-			echo "$as_me:30210: checking if <bsd/random.h> should be included" >&5
+			echo "$as_me:29638: checking if <bsd/random.h> should be included" >&5
 echo $ECHO_N "checking if <bsd/random.h> should be included... $ECHO_C" >&6
 			cat >conftest.$ac_ext <<_ACEOF
-#line 30213 "configure"
+#line 29641 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -30223,23 +29651,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30226: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29654: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30229: \$? = $ac_status" >&5
+  echo "$as_me:29657: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30235: \$? = $ac_status" >&5
+  echo "$as_me:29663: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_random_h=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 30242 "configure"
+#line 29670 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -30251,16 +29679,16 @@ unsigned x = arc4random()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30254: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29682: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30257: \$? = $ac_status" >&5
+  echo "$as_me:29685: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29688: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30263: \$? = $ac_status" >&5
+  echo "$as_me:29691: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_random_h=yes
 else
@@ -30271,7 +29699,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-			echo "$as_me:30274: result: $cf_bsd_random_h" >&5
+			echo "$as_me:29702: result: $cf_bsd_random_h" >&5
 echo "${ECHO_T}$cf_bsd_random_h" >&6
 			if test "$cf_bsd_random_h" = yes
 			then
@@ -30281,7 +29709,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 			else
-				{ echo "$as_me:30284: WARNING: no header file found for arc4random" >&5
+				{ echo "$as_me:29712: WARNING: no header file found for arc4random" >&5
 echo "$as_me: WARNING: no header file found for arc4random" >&2;}
 			fi
 		fi
@@ -30316,13 +29744,13 @@ fi
 for ac_func in sleep
 do
 
-echo "$as_me:30319: checking for $ac_func declaration" >&5
+echo "$as_me:29747: 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 30325 "configure"
+#line 29753 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30343,20 +29771,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30346: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29774: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30349: \$? = $ac_status" >&5
+  echo "$as_me:29777: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30352: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30355: \$? = $ac_status" >&5
+  echo "$as_me:29783: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30359 "configure"
+#line 29787 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30377,16 +29805,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30380: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29808: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30383: \$? = $ac_status" >&5
+  echo "$as_me:29811: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30389: \$? = $ac_status" >&5
+  echo "$as_me:29817: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30407,11 +29835,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:30410: result: yes" >&5
+  echo "$as_me:29838: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30414: result: no" >&5
+  echo "$as_me:29842: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30426,13 +29854,13 @@ done
 for ac_func in strstr
 do
 
-echo "$as_me:30429: checking for $ac_func declaration" >&5
+echo "$as_me:29857: 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 30435 "configure"
+#line 29863 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -30446,20 +29874,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30449: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29877: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30452: \$? = $ac_status" >&5
+  echo "$as_me:29880: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30455: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29883: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30458: \$? = $ac_status" >&5
+  echo "$as_me:29886: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30462 "configure"
+#line 29890 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -30473,16 +29901,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30476: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29904: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30479: \$? = $ac_status" >&5
+  echo "$as_me:29907: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29910: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30485: \$? = $ac_status" >&5
+  echo "$as_me:29913: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30503,11 +29931,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:30506: result: yes" >&5
+  echo "$as_me:29934: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30510: result: no" >&5
+  echo "$as_me:29938: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30522,13 +29950,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:30525: checking for $ac_func declaration" >&5
+echo "$as_me:29953: 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 30531 "configure"
+#line 29959 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -30544,20 +29972,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30547: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29975: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30550: \$? = $ac_status" >&5
+  echo "$as_me:29978: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30556: \$? = $ac_status" >&5
+  echo "$as_me:29984: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30560 "configure"
+#line 29988 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -30573,16 +30001,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30576: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30004: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30579: \$? = $ac_status" >&5
+  echo "$as_me:30007: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30010: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30585: \$? = $ac_status" >&5
+  echo "$as_me:30013: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30603,11 +30031,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:30606: result: yes" >&5
+  echo "$as_me:30034: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30610: result: no" >&5
+  echo "$as_me:30038: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30619,14 +30047,14 @@ EOF
 fi
 done
 
-echo "$as_me:30622: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:30050: 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 30629 "configure"
+#line 30057 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -30640,16 +30068,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30643: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30071: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30646: \$? = $ac_status" >&5
+  echo "$as_me:30074: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30652: \$? = $ac_status" >&5
+  echo "$as_me:30080: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -30660,7 +30088,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:30663: result: $cf_cv_bool_defs" >&5
+echo "$as_me:30091: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 
@@ -30674,14 +30102,14 @@ EOF
 
 fi
 
-echo "$as_me:30677: checking if external errno is declared" >&5
+echo "$as_me:30105: 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 30684 "configure"
+#line 30112 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30699,16 +30127,16 @@ int x = (int) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30702: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30130: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30705: \$? = $ac_status" >&5
+  echo "$as_me:30133: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30711: \$? = $ac_status" >&5
+  echo "$as_me:30139: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -30719,7 +30147,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30722: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:30150: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -30734,14 +30162,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30737: checking if external errno exists" >&5
+echo "$as_me:30165: 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 30744 "configure"
+#line 30172 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -30756,16 +30184,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30759: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30187: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30762: \$? = $ac_status" >&5
+  echo "$as_me:30190: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30768: \$? = $ac_status" >&5
+  echo "$as_me:30196: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -30776,7 +30204,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30779: result: $cf_cv_have_errno" >&5
+echo "$as_me:30207: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -30789,7 +30217,7 @@ EOF
 
 fi
 
-echo "$as_me:30792: checking if we can set errno" >&5
+echo "$as_me:30220: 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
@@ -30797,7 +30225,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 30800 "configure"
+#line 30228 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -30809,16 +30237,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30240: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30815: \$? = $ac_status" >&5
+  echo "$as_me:30243: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30821: \$? = $ac_status" >&5
+  echo "$as_me:30249: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -30829,7 +30257,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 30832 "configure"
+#line 30260 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -30840,15 +30268,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:30843: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30271: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30846: \$? = $ac_status" >&5
+  echo "$as_me:30274: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:30848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30851: \$? = $ac_status" >&5
+  echo "$as_me:30279: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -30861,21 +30289,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:30864: result: $cf_cv_set_errno" >&5
+echo "$as_me:30292: 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:30871: checking for setlocale()" >&5
+echo "$as_me:30299: 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 30878 "configure"
+#line 30306 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -30887,16 +30315,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30890: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30318: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30893: \$? = $ac_status" >&5
+  echo "$as_me:30321: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30899: \$? = $ac_status" >&5
+  echo "$as_me:30327: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -30908,7 +30336,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:30911: result: $cf_cv_locale" >&5
+echo "$as_me:30339: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && {
 cat >>confdefs.h <<\EOF
@@ -30916,14 +30344,14 @@ cat >>confdefs.h <<\EOF
 EOF
  }
 
-echo "$as_me:30919: checking if NGROUPS is defined" >&5
+echo "$as_me:30347: 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 30926 "configure"
+#line 30354 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -30942,23 +30370,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30945: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30373: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30948: \$? = $ac_status" >&5
+  echo "$as_me:30376: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30954: \$? = $ac_status" >&5
+  echo "$as_me:30382: \$? = $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 30961 "configure"
+#line 30389 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -30977,16 +30405,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30980: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30408: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30983: \$? = $ac_status" >&5
+  echo "$as_me:30411: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30989: \$? = $ac_status" >&5
+  echo "$as_me:30417: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -30998,7 +30426,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:31001: result: $cf_cv_ngroups" >&5
+echo "$as_me:30429: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -31016,14 +30444,14 @@ EOF
 
 fi
 
-echo "$as_me:31019: checking if external sys_nerr is declared" >&5
+echo "$as_me:30447: 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 31026 "configure"
+#line 30454 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -31041,16 +30469,16 @@ int x = (int) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31044: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30472: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31047: \$? = $ac_status" >&5
+  echo "$as_me:30475: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31053: \$? = $ac_status" >&5
+  echo "$as_me:30481: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -31061,7 +30489,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31064: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:30492: 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
@@ -31076,14 +30504,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:31079: checking if external sys_nerr exists" >&5
+echo "$as_me:30507: 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 31086 "configure"
+#line 30514 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -31098,16 +30526,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31101: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30529: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31104: \$? = $ac_status" >&5
+  echo "$as_me:30532: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31110: \$? = $ac_status" >&5
+  echo "$as_me:30538: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -31118,7 +30546,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31121: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:30549: 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
@@ -31131,14 +30559,14 @@ EOF
 
 fi
 
-echo "$as_me:31134: checking if external sys_errlist is declared" >&5
+echo "$as_me:30562: 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 31141 "configure"
+#line 30569 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -31156,16 +30584,16 @@ int x = (int) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31159: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30587: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31162: \$? = $ac_status" >&5
+  echo "$as_me:30590: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30593: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31168: \$? = $ac_status" >&5
+  echo "$as_me:30596: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -31176,7 +30604,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31179: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:30607: 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
@@ -31191,14 +30619,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:31194: checking if external sys_errlist exists" >&5
+echo "$as_me:30622: 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 31201 "configure"
+#line 30629 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -31213,16 +30641,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31216: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30644: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31219: \$? = $ac_status" >&5
+  echo "$as_me:30647: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31225: \$? = $ac_status" >&5
+  echo "$as_me:30653: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -31233,7 +30661,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31236: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:30664: 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
@@ -31249,23 +30677,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:31252: checking for $ac_header" >&5
+echo "$as_me:30680: 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 31258 "configure"
+#line 30686 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31262: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:30690: \"$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:31268: \$? = $ac_status" >&5
+  echo "$as_me:30696: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31284,7 +30712,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:31287: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:30715: 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
@@ -31294,14 +30722,14 @@ EOF
 fi
 done
 
-echo "$as_me:31297: checking for lastlog path" >&5
+echo "$as_me:30725: 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 31304 "configure"
+#line 30732 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31321,16 +30749,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31324: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30752: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31327: \$? = $ac_status" >&5
+  echo "$as_me:30755: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31333: \$? = $ac_status" >&5
+  echo "$as_me:30761: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -31345,14 +30773,14 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31348: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:30776: 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:31355: checking for utmp implementation" >&5
+echo "$as_me:30783: 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
@@ -31369,7 +30797,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31372 "configure"
+#line 30800 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -31383,16 +30811,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31386: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30814: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31389: \$? = $ac_status" >&5
+  echo "$as_me:30817: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31395: \$? = $ac_status" >&5
+  echo "$as_me:30823: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -31401,7 +30829,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31404 "configure"
+#line 30832 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -31415,16 +30843,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31418: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30846: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31421: \$? = $ac_status" >&5
+  echo "$as_me:30849: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31427: \$? = $ac_status" >&5
+  echo "$as_me:30855: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -31439,7 +30867,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31442: result: $cf_cv_have_utmp" >&5
+echo "$as_me:30870: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -31454,14 +30882,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31457: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:30885: 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 31464 "configure"
+#line 30892 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31475,16 +30903,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31478: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31481: \$? = $ac_status" >&5
+  echo "$as_me:30909: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31487: \$? = $ac_status" >&5
+  echo "$as_me:30915: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -31496,7 +30924,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:31499: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:30927: 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
@@ -31506,14 +30934,14 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31509: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:30937: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_syslen is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_syslen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31516 "configure"
+#line 30944 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31527,16 +30955,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31530: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30958: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31533: \$? = $ac_status" >&5
+  echo "$as_me:30961: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31539: \$? = $ac_status" >&5
+  echo "$as_me:30967: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -31548,7 +30976,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:31551: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:30979: result: $cf_cv_have_utmp_ut_syslen" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_syslen" >&6
 test $cf_cv_have_utmp_ut_syslen != no &&
 cat >>confdefs.h <<\EOF
@@ -31558,7 +30986,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31561: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:30989: 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
@@ -31575,7 +31003,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31578 "configure"
+#line 31006 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -31589,16 +31017,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31592: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31020: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31595: \$? = $ac_status" >&5
+  echo "$as_me:31023: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31601: \$? = $ac_status" >&5
+  echo "$as_me:31029: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -31610,12 +31038,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31613: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:31041: 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:31618: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:31046: 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; }; }
 	;;
@@ -31630,7 +31058,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31633: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:31061: 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
@@ -31643,7 +31071,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 31646 "configure"
+#line 31074 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31657,16 +31085,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31660: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31088: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31663: \$? = $ac_status" >&5
+  echo "$as_me:31091: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31094: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31669: \$? = $ac_status" >&5
+  echo "$as_me:31097: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -31679,7 +31107,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31682: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:31110: 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
 
@@ -31695,14 +31123,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31698: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:31126: 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 31705 "configure"
+#line 31133 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31716,23 +31144,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31719: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31147: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31722: \$? = $ac_status" >&5
+  echo "$as_me:31150: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31728: \$? = $ac_status" >&5
+  echo "$as_me:31156: \$? = $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 31735 "configure"
+#line 31163 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31746,16 +31174,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:31749: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31177: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31752: \$? = $ac_status" >&5
+  echo "$as_me:31180: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31758: \$? = $ac_status" >&5
+  echo "$as_me:31186: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -31769,7 +31197,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31772: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:31200: 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
 
@@ -31788,14 +31216,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31791: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:31219: 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 31798 "configure"
+#line 31226 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31809,16 +31237,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31812: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31240: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31815: \$? = $ac_status" >&5
+  echo "$as_me:31243: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31821: \$? = $ac_status" >&5
+  echo "$as_me:31249: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -31829,7 +31257,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31832: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:31260: 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
 
@@ -31840,7 +31268,7 @@ EOF
 fi
 fi
 
-echo "$as_me:31843: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:31271: 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
@@ -31848,7 +31276,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31851 "configure"
+#line 31279 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31867,16 +31295,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31870: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31298: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31873: \$? = $ac_status" >&5
+  echo "$as_me:31301: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31876: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31879: \$? = $ac_status" >&5
+  echo "$as_me:31307: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -31887,7 +31315,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31890: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:31318: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test $cf_cv_sysv_utmp = yes &&
 cat >>confdefs.h <<\EOF
@@ -31896,14 +31324,14 @@ EOF
 
 fi
 
-echo "$as_me:31899: checking if external h_errno exists" >&5
+echo "$as_me:31327: 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 31906 "configure"
+#line 31334 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -31918,16 +31346,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31921: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31349: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31924: \$? = $ac_status" >&5
+  echo "$as_me:31352: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31355: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31930: \$? = $ac_status" >&5
+  echo "$as_me:31358: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -31938,7 +31366,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31941: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:31369: 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
@@ -31951,7 +31379,7 @@ EOF
 
 fi
 
-echo "$as_me:31954: checking if bibp: URLs should be supported" >&5
+echo "$as_me:31382: 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.
@@ -31968,14 +31396,14 @@ else
   use_bibp_urls=yes
 
 fi;
-echo "$as_me:31971: result: $use_bibp_urls" >&5
+echo "$as_me:31399: 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:31978: checking if configuration info should be browsable" >&5
+echo "$as_me:31406: 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.
@@ -31992,14 +31420,14 @@ else
   use_config_info=yes
 
 fi;
-echo "$as_me:31995: result: $use_config_info" >&5
+echo "$as_me:31423: 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:32002: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:31430: 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.
@@ -32016,14 +31444,14 @@ else
   use_forms_options=yes
 
 fi;
-echo "$as_me:32019: result: $use_forms_options" >&5
+echo "$as_me:31447: 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:32026: checking if old-style options menu should be used" >&5
+echo "$as_me:31454: 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.
@@ -32040,14 +31468,14 @@ else
   use_menu_options=yes
 
 fi;
-echo "$as_me:32043: result: $use_menu_options" >&5
+echo "$as_me:31471: 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:32050: checking if sessions code should be used" >&5
+echo "$as_me:31478: checking if sessions code should be used" >&5
 echo $ECHO_N "checking if sessions code should be used... $ECHO_C" >&6
 
 # Check whether --enable-sessions or --disable-sessions was given.
@@ -32064,7 +31492,7 @@ else
   use_sessions=yes
 
 fi;
-echo "$as_me:32067: result: $use_sessions" >&5
+echo "$as_me:31495: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
 
@@ -32075,7 +31503,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:32078: checking if session-caching code should be used" >&5
+echo "$as_me:31506: 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.
@@ -32092,7 +31520,7 @@ else
   use_session_cache=yes
 
 fi;
-echo "$as_me:32095: result: $use_session_cache" >&5
+echo "$as_me:31523: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
 
@@ -32102,7 +31530,7 @@ EOF
 
 fi
 
-echo "$as_me:32105: checking if address-list page should be used" >&5
+echo "$as_me:31533: checking if address-list page should be used" >&5
 echo $ECHO_N "checking if address-list page should be used... $ECHO_C" >&6
 
 # Check whether --enable-addrlist-page or --disable-addrlist-page was given.
@@ -32119,14 +31547,14 @@ else
   use_addrlist_page=yes
 
 fi;
-echo "$as_me:32122: result: $use_addrlist_page" >&5
+echo "$as_me:31550: result: $use_addrlist_page" >&5
 echo "${ECHO_T}$use_addrlist_page" >&6
 test $use_addrlist_page != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ADDRLIST_PAGE 1
 EOF
 
-echo "$as_me:32129: checking if experimental CJK logic should be used" >&5
+echo "$as_me:31557: 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.
@@ -32143,14 +31571,14 @@ else
   use_cjk=no
 
 fi;
-echo "$as_me:32146: result: $use_cjk" >&5
+echo "$as_me:31574: 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:32153: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:31581: 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.
@@ -32167,7 +31595,7 @@ else
   use_ja_utf8=no
 
 fi;
-echo "$as_me:32170: result: $use_ja_utf8" >&5
+echo "$as_me:31598: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 
@@ -32213,7 +31641,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32216 "configure"
+#line 31644 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32225,16 +31653,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32228: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31656: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32231: \$? = $ac_status" >&5
+  echo "$as_me:31659: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32234: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32237: \$? = $ac_status" >&5
+  echo "$as_me:31665: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32251,7 +31679,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:32254: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31682: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32292,7 +31720,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32295 "configure"
+#line 31723 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32304,16 +31732,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32307: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31735: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32310: \$? = $ac_status" >&5
+  echo "$as_me:31738: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31741: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32316: \$? = $ac_status" >&5
+  echo "$as_me:31744: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32330,7 +31758,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:32333: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31761: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32346,7 +31774,7 @@ echo "${as_me:-configure}:32333: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:32349: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:31777: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32371,7 +31799,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:32374: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:31802: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32400,7 +31828,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:32403: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:31831: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32409,7 +31837,7 @@ echo "${as_me:-configure}:32403: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:32412: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:31840: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32420,7 +31848,7 @@ done
 
 fi;
 
-  echo "$as_me:32423: checking for iconv" >&5
+  echo "$as_me:31851: 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
@@ -32431,12 +31859,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:32434: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:31862: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32439 "configure"
+#line 31867 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32455,16 +31883,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32458: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31886: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32461: \$? = $ac_status" >&5
+  echo "$as_me:31889: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32464: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31892: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32467: \$? = $ac_status" >&5
+  echo "$as_me:31895: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -32478,7 +31906,7 @@ cat conftest.$ac_ext >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32481 "configure"
+#line 31909 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32497,16 +31925,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31928: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32503: \$? = $ac_status" >&5
+  echo "$as_me:31931: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32509: \$? = $ac_status" >&5
+  echo "$as_me:31937: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -32523,9 +31951,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:32526: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:31954: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:32528: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:31956: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32562,17 +31990,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/iconv &&       cf_search="$cf_search /usr/include/iconv"
-	test -d /usr/include/iconv/include &&    cf_search="$cf_search /usr/include/iconv/include"
-	test -d /usr/iconv/include &&       cf_search="$cf_search /usr/iconv/include"
-	test -d /usr/iconv/include/iconv &&    cf_search="$cf_search /usr/iconv/include/iconv"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -32584,38 +32001,27 @@ test -d "$prefix" && \
 	test -d $prefix/iconv/include/iconv &&    cf_search="$cf_search $prefix/iconv/include/iconv"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/iconv &&       cf_search="$cf_search /usr/local/include/iconv"
-	test -d /usr/local/include/iconv/include &&    cf_search="$cf_search /usr/local/include/iconv/include"
-	test -d /usr/local/iconv/include &&       cf_search="$cf_search /usr/local/iconv/include"
-	test -d /usr/local/iconv/include/iconv &&    cf_search="$cf_search /usr/local/iconv/include/iconv"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/iconv &&       cf_search="$cf_search /opt/include/iconv"
-	test -d /opt/include/iconv/include &&    cf_search="$cf_search /opt/include/iconv/include"
-	test -d /opt/iconv/include &&       cf_search="$cf_search /opt/iconv/include"
-	test -d /opt/iconv/include/iconv &&    cf_search="$cf_search /opt/iconv/include/iconv"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/iconv &&       cf_search="$cf_search $cf_subdir_prefix/include/iconv"
+	test -d $cf_subdir_prefix/include/iconv/include &&    cf_search="$cf_search $cf_subdir_prefix/include/iconv/include"
+	test -d $cf_subdir_prefix/iconv/include &&       cf_search="$cf_search $cf_subdir_prefix/iconv/include"
+	test -d $cf_subdir_prefix/iconv/include/iconv &&    cf_search="$cf_search $cf_subdir_prefix/iconv/include/iconv"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/iconv &&       cf_search="$cf_search $HOME/include/iconv"
-	test -d $HOME/include/iconv/include &&    cf_search="$cf_search $HOME/include/iconv/include"
-	test -d $HOME/iconv/include &&       cf_search="$cf_search $HOME/iconv/include"
-	test -d $HOME/iconv/include/iconv &&    cf_search="$cf_search $HOME/iconv/include/iconv"
-}
+done
 
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
@@ -32638,11 +32044,11 @@ cf_search="$cf_search $cf_header_path_list"
       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}:32641: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32047: 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 32645 "configure"
+#line 32051 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32661,21 +32067,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32664: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32070: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32667: \$? = $ac_status" >&5
+  echo "$as_me:32073: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32673: \$? = $ac_status" >&5
+  echo "$as_me:32079: \$? = $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}:32678: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32084: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32693,7 +32099,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:32696: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32102: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -32728,17 +32134,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/iconv &&       cf_search="$cf_search /usr/lib/iconv"
-	test -d /usr/lib/iconv/lib &&    cf_search="$cf_search /usr/lib/iconv/lib"
-	test -d /usr/iconv/lib &&       cf_search="$cf_search /usr/iconv/lib"
-	test -d /usr/iconv/lib/iconv &&    cf_search="$cf_search /usr/iconv/lib/iconv"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -32750,38 +32145,27 @@ test -d "$prefix" && \
 	test -d $prefix/iconv/lib/iconv &&    cf_search="$cf_search $prefix/iconv/lib/iconv"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/iconv &&       cf_search="$cf_search /usr/local/lib/iconv"
-	test -d /usr/local/lib/iconv/lib &&    cf_search="$cf_search /usr/local/lib/iconv/lib"
-	test -d /usr/local/iconv/lib &&       cf_search="$cf_search /usr/local/iconv/lib"
-	test -d /usr/local/iconv/lib/iconv &&    cf_search="$cf_search /usr/local/iconv/lib/iconv"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/iconv &&       cf_search="$cf_search /opt/lib/iconv"
-	test -d /opt/lib/iconv/lib &&    cf_search="$cf_search /opt/lib/iconv/lib"
-	test -d /opt/iconv/lib &&       cf_search="$cf_search /opt/iconv/lib"
-	test -d /opt/iconv/lib/iconv &&    cf_search="$cf_search /opt/iconv/lib/iconv"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/iconv &&       cf_search="$cf_search $cf_subdir_prefix/lib/iconv"
+	test -d $cf_subdir_prefix/lib/iconv/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/iconv/lib"
+	test -d $cf_subdir_prefix/iconv/lib &&       cf_search="$cf_search $cf_subdir_prefix/iconv/lib"
+	test -d $cf_subdir_prefix/iconv/lib/iconv &&    cf_search="$cf_search $cf_subdir_prefix/iconv/lib/iconv"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/iconv &&       cf_search="$cf_search $HOME/lib/iconv"
-	test -d $HOME/lib/iconv/lib &&    cf_search="$cf_search $HOME/lib/iconv/lib"
-	test -d $HOME/iconv/lib &&       cf_search="$cf_search $HOME/iconv/lib"
-	test -d $HOME/iconv/lib/iconv &&    cf_search="$cf_search $HOME/iconv/lib/iconv"
-}
+done
 
 cf_search="$cf_library_path_list $cf_search"
 
@@ -32790,13 +32174,13 @@ cf_search="$cf_library_path_list $cf_search"
           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}:32793: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32177: 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 32799 "configure"
+#line 32183 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32815,21 +32199,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32818: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32202: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32821: \$? = $ac_status" >&5
+  echo "$as_me:32205: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32827: \$? = $ac_status" >&5
+  echo "$as_me:32211: \$? = $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}:32832: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32216: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -32869,7 +32253,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:32872: result: $am_cv_func_iconv" >&5
+echo "$as_me:32256: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -32878,14 +32262,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:32881: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:32265: 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 32888 "configure"
+#line 32272 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32910,16 +32294,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32913: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32297: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32916: \$? = $ac_status" >&5
+  echo "$as_me:32300: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32922: \$? = $ac_status" >&5
+  echo "$as_me:32306: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -32929,7 +32313,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:32932: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:32316: 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
@@ -32971,7 +32355,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 32974 "configure"
+#line 32358 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32983,16 +32367,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32986: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32370: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32989: \$? = $ac_status" >&5
+  echo "$as_me:32373: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32995: \$? = $ac_status" >&5
+  echo "$as_me:32379: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33009,7 +32393,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:33012: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32396: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33046,7 +32430,7 @@ if test -n "$cf_cv_library_path_iconv" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:33049: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32433: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -33070,7 +32454,7 @@ curses|slang|ncurses*)
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:33073: checking if you want to use default-colors" >&5
+echo "$as_me:32457: 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.
@@ -33087,7 +32471,7 @@ else
   use_dft_colors=no
 
 fi;
-echo "$as_me:33090: result: $use_dft_colors" >&5
+echo "$as_me:32474: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test $use_dft_colors = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -33096,7 +32480,7 @@ EOF
 
 fi
 
-echo "$as_me:33099: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:32483: 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.
@@ -33113,14 +32497,14 @@ else
   use_kbd_layout=no
 
 fi;
-echo "$as_me:33116: result: $use_kbd_layout" >&5
+echo "$as_me:32500: 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:33123: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:32507: 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.
@@ -33137,14 +32521,14 @@ else
   use_nested_tables=no
 
 fi;
-echo "$as_me:33140: result: $use_nested_tables" >&5
+echo "$as_me:32524: 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:33147: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:32531: 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.
@@ -33161,14 +32545,14 @@ else
   use_alt_bindings=yes
 
 fi;
-echo "$as_me:33164: result: $use_alt_bindings" >&5
+echo "$as_me:32548: result: $use_alt_bindings" >&5
 echo "${ECHO_T}$use_alt_bindings" >&6
 test $use_alt_bindings != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ALT_BINDINGS 1
 EOF
 
-echo "$as_me:33171: checking if ascii case-conversion should be used" >&5
+echo "$as_me:32555: checking if ascii case-conversion should be used" >&5
 echo $ECHO_N "checking if ascii case-conversion should be used... $ECHO_C" >&6
 
 # Check whether --enable-ascii-ctypes or --disable-ascii-ctypes was given.
@@ -33185,14 +32569,14 @@ else
   use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:33188: result: $use_ascii_ctypes" >&5
+echo "$as_me:32572: result: $use_ascii_ctypes" >&5
 echo "${ECHO_T}$use_ascii_ctypes" >&6
 test $use_ascii_ctypes != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ASCII_CTYPES 1
 EOF
 
-echo "$as_me:33195: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:32579: 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.
@@ -33209,14 +32593,14 @@ else
   use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:33212: result: $use_ext_htmldtd" >&5
+echo "$as_me:32596: 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:33219: checking if file-upload logic should be used" >&5
+echo "$as_me:32603: 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.
@@ -33233,14 +32617,14 @@ else
   use_file_upload=yes
 
 fi;
-echo "$as_me:33236: result: $use_file_upload" >&5
+echo "$as_me:32620: 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:33243: checking if IDNA support should be used" >&5
+echo "$as_me:32627: checking if IDNA support should be used" >&5
 echo $ECHO_N "checking if IDNA support should be used... $ECHO_C" >&6
 
 # Check whether --enable-idna or --disable-idna was given.
@@ -33257,7 +32641,7 @@ else
   use_idna=yes
 
 fi;
-echo "$as_me:33260: result: $use_idna" >&5
+echo "$as_me:32644: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -33296,7 +32680,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33299 "configure"
+#line 32683 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33308,16 +32692,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33311: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32695: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33314: \$? = $ac_status" >&5
+  echo "$as_me:32698: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33320: \$? = $ac_status" >&5
+  echo "$as_me:32704: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33334,7 +32718,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:33337: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32721: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33375,7 +32759,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33378 "configure"
+#line 32762 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33387,16 +32771,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33390: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32774: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33393: \$? = $ac_status" >&5
+  echo "$as_me:32777: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33399: \$? = $ac_status" >&5
+  echo "$as_me:32783: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33413,7 +32797,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:33416: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32800: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33429,7 +32813,7 @@ echo "${as_me:-configure}:33416: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:33432: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:32816: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33454,7 +32838,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:33457: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32841: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -33483,7 +32867,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:33486: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32870: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -33492,7 +32876,7 @@ echo "${as_me:-configure}:33486: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:33495: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:32879: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33506,12 +32890,12 @@ done
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me:-configure}:33509: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:32893: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33514 "configure"
+#line 32898 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33529,16 +32913,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33532: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32916: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33535: \$? = $ac_status" >&5
+  echo "$as_me:32919: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33538: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33541: \$? = $ac_status" >&5
+  echo "$as_me:32925: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -33552,7 +32936,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33555 "configure"
+#line 32939 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33570,16 +32954,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33573: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32957: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33576: \$? = $ac_status" >&5
+  echo "$as_me:32960: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33582: \$? = $ac_status" >&5
+  echo "$as_me:32966: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -33596,9 +32980,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me:-configure}:33599: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:32983: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me:-configure}:33601: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:32985: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33635,17 +33019,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/idn &&       cf_search="$cf_search /usr/include/idn"
-	test -d /usr/include/idn/include &&    cf_search="$cf_search /usr/include/idn/include"
-	test -d /usr/idn/include &&       cf_search="$cf_search /usr/idn/include"
-	test -d /usr/idn/include/idn &&    cf_search="$cf_search /usr/idn/include/idn"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -33657,38 +33030,27 @@ test -d "$prefix" && \
 	test -d $prefix/idn/include/idn &&    cf_search="$cf_search $prefix/idn/include/idn"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/idn &&       cf_search="$cf_search /usr/local/include/idn"
-	test -d /usr/local/include/idn/include &&    cf_search="$cf_search /usr/local/include/idn/include"
-	test -d /usr/local/idn/include &&       cf_search="$cf_search /usr/local/idn/include"
-	test -d /usr/local/idn/include/idn &&    cf_search="$cf_search /usr/local/idn/include/idn"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/idn &&       cf_search="$cf_search /opt/include/idn"
-	test -d /opt/include/idn/include &&    cf_search="$cf_search /opt/include/idn/include"
-	test -d /opt/idn/include &&       cf_search="$cf_search /opt/idn/include"
-	test -d /opt/idn/include/idn &&    cf_search="$cf_search /opt/idn/include/idn"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/idn &&       cf_search="$cf_search $cf_subdir_prefix/include/idn"
+	test -d $cf_subdir_prefix/include/idn/include &&    cf_search="$cf_search $cf_subdir_prefix/include/idn/include"
+	test -d $cf_subdir_prefix/idn/include &&       cf_search="$cf_search $cf_subdir_prefix/idn/include"
+	test -d $cf_subdir_prefix/idn/include/idn &&    cf_search="$cf_search $cf_subdir_prefix/idn/include/idn"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/idn &&       cf_search="$cf_search $HOME/include/idn"
-	test -d $HOME/include/idn/include &&    cf_search="$cf_search $HOME/include/idn/include"
-	test -d $HOME/idn/include &&       cf_search="$cf_search $HOME/idn/include"
-	test -d $HOME/idn/include/idn &&    cf_search="$cf_search $HOME/idn/include/idn"
-}
+done
 
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
@@ -33711,11 +33073,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_idn ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_idn" 1>&6
 
-echo "${as_me:-configure}:33714: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:33076: testing ... testing $cf_cv_header_path_idn ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_idn"
         cat >conftest.$ac_ext <<_ACEOF
-#line 33718 "configure"
+#line 33080 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33733,21 +33095,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33736: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33098: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33739: \$? = $ac_status" >&5
+  echo "$as_me:33101: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33742: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33745: \$? = $ac_status" >&5
+  echo "$as_me:33107: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found idn headers in $cf_cv_header_path_idn" 1>&6
 
-echo "${as_me:-configure}:33750: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:33112: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
             cf_cv_find_linkage_idn=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33765,7 +33127,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me:-configure}:33768: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33130: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -33800,17 +33162,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/idn &&       cf_search="$cf_search /usr/lib/idn"
-	test -d /usr/lib/idn/lib &&    cf_search="$cf_search /usr/lib/idn/lib"
-	test -d /usr/idn/lib &&       cf_search="$cf_search /usr/idn/lib"
-	test -d /usr/idn/lib/idn &&    cf_search="$cf_search /usr/idn/lib/idn"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -33822,38 +33173,27 @@ test -d "$prefix" && \
 	test -d $prefix/idn/lib/idn &&    cf_search="$cf_search $prefix/idn/lib/idn"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/idn &&       cf_search="$cf_search /usr/local/lib/idn"
-	test -d /usr/local/lib/idn/lib &&    cf_search="$cf_search /usr/local/lib/idn/lib"
-	test -d /usr/local/idn/lib &&       cf_search="$cf_search /usr/local/idn/lib"
-	test -d /usr/local/idn/lib/idn &&    cf_search="$cf_search /usr/local/idn/lib/idn"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/idn &&       cf_search="$cf_search /opt/lib/idn"
-	test -d /opt/lib/idn/lib &&    cf_search="$cf_search /opt/lib/idn/lib"
-	test -d /opt/idn/lib &&       cf_search="$cf_search /opt/idn/lib"
-	test -d /opt/idn/lib/idn &&    cf_search="$cf_search /opt/idn/lib/idn"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/idn &&       cf_search="$cf_search $cf_subdir_prefix/lib/idn"
+	test -d $cf_subdir_prefix/lib/idn/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/idn/lib"
+	test -d $cf_subdir_prefix/idn/lib &&       cf_search="$cf_search $cf_subdir_prefix/idn/lib"
+	test -d $cf_subdir_prefix/idn/lib/idn &&    cf_search="$cf_search $cf_subdir_prefix/idn/lib/idn"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/idn &&       cf_search="$cf_search $HOME/lib/idn"
-	test -d $HOME/lib/idn/lib &&    cf_search="$cf_search $HOME/lib/idn/lib"
-	test -d $HOME/idn/lib &&       cf_search="$cf_search $HOME/idn/lib"
-	test -d $HOME/idn/lib/idn &&    cf_search="$cf_search $HOME/idn/lib/idn"
-}
+done
 
 cf_search="$cf_library_path_list $cf_search"
 
@@ -33862,13 +33202,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_idn ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_idn" 1>&6
 
-echo "${as_me:-configure}:33865: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:33205: testing ... testing $cf_cv_library_path_idn ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lidn $LIBICONV $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_idn"
             cat >conftest.$ac_ext <<_ACEOF
-#line 33871 "configure"
+#line 33211 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33886,21 +33226,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33889: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33229: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33892: \$? = $ac_status" >&5
+  echo "$as_me:33232: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33235: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33898: \$? = $ac_status" >&5
+  echo "$as_me:33238: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found idn library in $cf_cv_library_path_idn" 1>&6
 
-echo "${as_me:-configure}:33903: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:33243: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
                 cf_cv_find_linkage_idn=yes
                 cf_cv_library_file_idn="-lidn"
@@ -33959,7 +33299,7 @@ if test -n "$cf_cv_header_path_idn" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33962 "configure"
+#line 33302 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33971,16 +33311,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33974: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33314: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33977: \$? = $ac_status" >&5
+  echo "$as_me:33317: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33983: \$? = $ac_status" >&5
+  echo "$as_me:33323: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33997,7 +33337,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:34000: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33340: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34031,7 +33371,7 @@ if test -n "$cf_cv_library_path_idn" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:34034: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33374: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -34056,7 +33396,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:34059: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:33399: WARNING: Cannot find idn library" >&5
 echo "$as_me: WARNING: Cannot find idn library" >&2;}
 fi
 
@@ -34070,7 +33410,7 @@ fi
 
 fi
 
-echo "$as_me:34073: checking if element-justification logic should be used" >&5
+echo "$as_me:33413: 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.
@@ -34087,14 +33427,14 @@ else
   use_justify_elts=yes
 
 fi;
-echo "$as_me:34090: result: $use_justify_elts" >&5
+echo "$as_me:33430: result: $use_justify_elts" >&5
 echo "${ECHO_T}$use_justify_elts" >&6
 test $use_justify_elts != no &&
 cat >>confdefs.h <<\EOF
 #define USE_JUSTIFY_ELTS 1
 EOF
 
-echo "$as_me:34097: checking if partial-display should be used" >&5
+echo "$as_me:33437: 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.
@@ -34111,14 +33451,14 @@ else
   use_partial_display=yes
 
 fi;
-echo "$as_me:34114: result: $use_partial_display" >&5
+echo "$as_me:33454: 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:34121: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:33461: 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.
@@ -34135,14 +33475,14 @@ else
   use_filed_cookies=yes
 
 fi;
-echo "$as_me:34138: result: $use_filed_cookies" >&5
+echo "$as_me:33478: 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:34145: checking if html source should be colorized" >&5
+echo "$as_me:33485: 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.
@@ -34159,14 +33499,14 @@ else
   use_prettysrc=yes
 
 fi;
-echo "$as_me:34162: result: $use_prettysrc" >&5
+echo "$as_me:33502: 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:34169: checking if progress-bar code should be used" >&5
+echo "$as_me:33509: 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.
@@ -34183,14 +33523,14 @@ else
   use_progressbar=yes
 
 fi;
-echo "$as_me:34186: result: $use_progressbar" >&5
+echo "$as_me:33526: 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:34193: checking if read-progress message should show ETA" >&5
+echo "$as_me:33533: 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.
@@ -34207,14 +33547,14 @@ else
   use_read_eta=yes
 
 fi;
-echo "$as_me:34210: result: $use_read_eta" >&5
+echo "$as_me:33550: 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:34217: checking if source caching should be used" >&5
+echo "$as_me:33557: 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.
@@ -34231,14 +33571,14 @@ else
   use_source_cache=yes
 
 fi;
-echo "$as_me:34234: result: $use_source_cache" >&5
+echo "$as_me:33574: 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:34241: checking if scrollbar code should be used" >&5
+echo "$as_me:33581: 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.
@@ -34255,10 +33595,10 @@ else
   use_scrollbar=yes
 
 fi;
-echo "$as_me:34258: result: $use_scrollbar" >&5
+echo "$as_me:33598: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:34261: checking if charset-selection logic should be used" >&5
+echo "$as_me:33601: checking if charset-selection logic should be used" >&5
 echo $ECHO_N "checking if charset-selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-charset-choice or --disable-charset-choice was given.
@@ -34275,14 +33615,14 @@ else
   use_charset_choice=no
 
 fi;
-echo "$as_me:34278: result: $use_charset_choice" >&5
+echo "$as_me:33618: result: $use_charset_choice" >&5
 echo "${ECHO_T}$use_charset_choice" >&6
 test $use_charset_choice != no &&
 cat >>confdefs.h <<\EOF
 #define USE_CHARSET_CHOICE 1
 EOF
 
-echo "$as_me:34285: checking if you want to use external commands" >&5
+echo "$as_me:33625: 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.
@@ -34299,7 +33639,7 @@ else
   use_externs=no
 
 fi;
-echo "$as_me:34302: result: $use_externs" >&5
+echo "$as_me:33642: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 
@@ -34310,7 +33650,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:34313: checking if you want to use setfont support" >&5
+echo "$as_me:33653: 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.
@@ -34327,7 +33667,7 @@ else
   use_setfont=no
 
 fi;
-echo "$as_me:34330: result: $use_setfont" >&5
+echo "$as_me:33670: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -34338,7 +33678,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:34341: checking for $ac_word" >&5
+echo "$as_me:33681: 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
@@ -34355,7 +33695,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:34358: found $ac_dir/$ac_word" >&5
+   echo "$as_me:33698: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34366,10 +33706,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:34369: result: $SETFONT" >&5
+  echo "$as_me:33709: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:34372: result: no" >&5
+  echo "$as_me:33712: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34428,7 +33768,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:34431: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:33771: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -34446,19 +33786,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me:-configure}:34449: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:33789: 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}:34456: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:33796: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:34461: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:33801: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 
@@ -34469,7 +33809,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:34472: checking if you want cgi-link support" >&5
+echo "$as_me:33812: 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.
@@ -34486,10 +33826,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:34489: result: $enableval" >&5
+echo "$as_me:33829: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:34492: checking if you want change-exec support" >&5
+echo "$as_me:33832: 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.
@@ -34506,14 +33846,14 @@ else
   use_change_exec=no
 
 fi;
-echo "$as_me:34509: result: $use_change_exec" >&5
+echo "$as_me:33849: 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:34516: checking if you want exec-links support" >&5
+echo "$as_me:33856: 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.
@@ -34530,14 +33870,14 @@ else
   use_exec_links=$enableval
 
 fi;
-echo "$as_me:34533: result: $use_exec_links" >&5
+echo "$as_me:33873: 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:34540: checking if you want exec-scripts support" >&5
+echo "$as_me:33880: 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.
@@ -34554,14 +33894,14 @@ else
   use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:34557: result: $use_exec_scripts" >&5
+echo "$as_me:33897: 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:34564: checking if you want internal-links feature" >&5
+echo "$as_me:33904: 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.
@@ -34578,14 +33918,14 @@ else
   use_internal_links=no
 
 fi;
-echo "$as_me:34581: result: $use_internal_links" >&5
+echo "$as_me:33921: result: $use_internal_links" >&5
 echo "${ECHO_T}$use_internal_links" >&6
 test $use_internal_links = yes &&
 cat >>confdefs.h <<\EOF
 #define TRACK_INTERNAL_LINKS 1
 EOF
 
-echo "$as_me:34588: checking if you want to fork NSL requests" >&5
+echo "$as_me:33928: 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.
@@ -34602,7 +33942,7 @@ else
   use_nsl_fork=no
 
 fi;
-echo "$as_me:34605: result: $use_nsl_fork" >&5
+echo "$as_me:33945: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test $use_nsl_fork = yes ; then
 	case $host_os in
@@ -34623,7 +33963,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:34626: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:33966: 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.
@@ -34640,14 +33980,14 @@ else
   use_syslog=no
 
 fi;
-echo "$as_me:34643: result: $use_syslog" >&5
+echo "$as_me:33983: 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:34650: checking if you want to underline links" >&5
+echo "$as_me:33990: 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.
@@ -34664,7 +34004,7 @@ else
   use_underline=no
 
 fi;
-echo "$as_me:34667: result: $use_underline" >&5
+echo "$as_me:34007: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes &&
 cat >>confdefs.h <<\EOF
@@ -34676,7 +34016,7 @@ cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:34679: checking if help files should be gzip'ed" >&5
+echo "$as_me:34019: 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.
@@ -34693,10 +34033,10 @@ else
   use_gzip_help=no
 
 fi;
-echo "$as_me:34696: result: $use_gzip_help" >&5
+echo "$as_me:34036: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:34699: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:34039: 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.
@@ -34706,7 +34046,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:34709: result: $use_bzlib" >&5
+echo "$as_me:34049: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -34745,7 +34085,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34748 "configure"
+#line 34088 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34757,16 +34097,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34760: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34100: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34763: \$? = $ac_status" >&5
+  echo "$as_me:34103: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34769: \$? = $ac_status" >&5
+  echo "$as_me:34109: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34783,7 +34123,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:34786: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34126: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34824,7 +34164,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34827 "configure"
+#line 34167 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34836,16 +34176,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34839: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34179: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34842: \$? = $ac_status" >&5
+  echo "$as_me:34182: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34848: \$? = $ac_status" >&5
+  echo "$as_me:34188: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34862,7 +34202,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:34865: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34205: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34878,7 +34218,7 @@ echo "${as_me:-configure}:34865: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:34881: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:34221: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -34903,7 +34243,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:34906: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34246: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -34932,7 +34272,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:34935: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34275: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -34941,7 +34281,7 @@ echo "${as_me:-configure}:34935: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:34944: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:34284: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -34955,12 +34295,12 @@ done
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me:-configure}:34958: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34298: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 34963 "configure"
+#line 34303 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34977,16 +34317,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34320: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34983: \$? = $ac_status" >&5
+  echo "$as_me:34323: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34989: \$? = $ac_status" >&5
+  echo "$as_me:34329: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -35000,7 +34340,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35003 "configure"
+#line 34343 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35017,16 +34357,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35020: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34360: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35023: \$? = $ac_status" >&5
+  echo "$as_me:34363: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35029: \$? = $ac_status" >&5
+  echo "$as_me:34369: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -35043,9 +34383,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me:-configure}:35046: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:34386: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me:-configure}:35048: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34388: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -35082,17 +34422,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/bzlib &&       cf_search="$cf_search /usr/include/bzlib"
-	test -d /usr/include/bzlib/include &&    cf_search="$cf_search /usr/include/bzlib/include"
-	test -d /usr/bzlib/include &&       cf_search="$cf_search /usr/bzlib/include"
-	test -d /usr/bzlib/include/bzlib &&    cf_search="$cf_search /usr/bzlib/include/bzlib"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -35104,38 +34433,27 @@ test -d "$prefix" && \
 	test -d $prefix/bzlib/include/bzlib &&    cf_search="$cf_search $prefix/bzlib/include/bzlib"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/bzlib &&       cf_search="$cf_search /usr/local/include/bzlib"
-	test -d /usr/local/include/bzlib/include &&    cf_search="$cf_search /usr/local/include/bzlib/include"
-	test -d /usr/local/bzlib/include &&       cf_search="$cf_search /usr/local/bzlib/include"
-	test -d /usr/local/bzlib/include/bzlib &&    cf_search="$cf_search /usr/local/bzlib/include/bzlib"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/bzlib &&       cf_search="$cf_search /opt/include/bzlib"
-	test -d /opt/include/bzlib/include &&    cf_search="$cf_search /opt/include/bzlib/include"
-	test -d /opt/bzlib/include &&       cf_search="$cf_search /opt/bzlib/include"
-	test -d /opt/bzlib/include/bzlib &&    cf_search="$cf_search /opt/bzlib/include/bzlib"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/bzlib &&       cf_search="$cf_search $cf_subdir_prefix/include/bzlib"
+	test -d $cf_subdir_prefix/include/bzlib/include &&    cf_search="$cf_search $cf_subdir_prefix/include/bzlib/include"
+	test -d $cf_subdir_prefix/bzlib/include &&       cf_search="$cf_search $cf_subdir_prefix/bzlib/include"
+	test -d $cf_subdir_prefix/bzlib/include/bzlib &&    cf_search="$cf_search $cf_subdir_prefix/bzlib/include/bzlib"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/bzlib &&       cf_search="$cf_search $HOME/include/bzlib"
-	test -d $HOME/include/bzlib/include &&    cf_search="$cf_search $HOME/include/bzlib/include"
-	test -d $HOME/bzlib/include &&       cf_search="$cf_search $HOME/bzlib/include"
-	test -d $HOME/bzlib/include/bzlib &&    cf_search="$cf_search $HOME/bzlib/include/bzlib"
-}
+done
 
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
@@ -35158,11 +34476,11 @@ cf_search="$cf_search $cf_header_path_list"
       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}:35161: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34479: 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 35165 "configure"
+#line 34483 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35179,21 +34497,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35182: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34500: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35185: \$? = $ac_status" >&5
+  echo "$as_me:34503: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35191: \$? = $ac_status" >&5
+  echo "$as_me:34509: \$? = $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}:35196: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34514: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
             cf_cv_find_linkage_bz2=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -35211,7 +34529,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me:-configure}:35214: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34532: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -35219,7 +34537,7 @@ echo "${as_me:-configure}:35214: testing Searching for bz2 library in FIND_LINKA
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lbz2  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 35222 "configure"
+#line 34540 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35236,21 +34554,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35239: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34557: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35242: \$? = $ac_status" >&5
+  echo "$as_me:34560: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35248: \$? = $ac_status" >&5
+  echo "$as_me:34566: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me:-configure}:35253: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:34571: testing ... found bz2 library in system ..." 1>&5
 
             cf_cv_find_linkage_bz2=yes
 else
@@ -35291,17 +34609,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/bz2 &&       cf_search="$cf_search /usr/lib/bz2"
-	test -d /usr/lib/bz2/lib &&    cf_search="$cf_search /usr/lib/bz2/lib"
-	test -d /usr/bz2/lib &&       cf_search="$cf_search /usr/bz2/lib"
-	test -d /usr/bz2/lib/bz2 &&    cf_search="$cf_search /usr/bz2/lib/bz2"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -35313,38 +34620,27 @@ test -d "$prefix" && \
 	test -d $prefix/bz2/lib/bz2 &&    cf_search="$cf_search $prefix/bz2/lib/bz2"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/bz2 &&       cf_search="$cf_search /usr/local/lib/bz2"
-	test -d /usr/local/lib/bz2/lib &&    cf_search="$cf_search /usr/local/lib/bz2/lib"
-	test -d /usr/local/bz2/lib &&       cf_search="$cf_search /usr/local/bz2/lib"
-	test -d /usr/local/bz2/lib/bz2 &&    cf_search="$cf_search /usr/local/bz2/lib/bz2"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/bz2 &&       cf_search="$cf_search /opt/lib/bz2"
-	test -d /opt/lib/bz2/lib &&    cf_search="$cf_search /opt/lib/bz2/lib"
-	test -d /opt/bz2/lib &&       cf_search="$cf_search /opt/bz2/lib"
-	test -d /opt/bz2/lib/bz2 &&    cf_search="$cf_search /opt/bz2/lib/bz2"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/bz2 &&       cf_search="$cf_search $cf_subdir_prefix/lib/bz2"
+	test -d $cf_subdir_prefix/lib/bz2/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/bz2/lib"
+	test -d $cf_subdir_prefix/bz2/lib &&       cf_search="$cf_search $cf_subdir_prefix/bz2/lib"
+	test -d $cf_subdir_prefix/bz2/lib/bz2 &&    cf_search="$cf_search $cf_subdir_prefix/bz2/lib/bz2"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/bz2 &&       cf_search="$cf_search $HOME/lib/bz2"
-	test -d $HOME/lib/bz2/lib &&    cf_search="$cf_search $HOME/lib/bz2/lib"
-	test -d $HOME/bz2/lib &&       cf_search="$cf_search $HOME/bz2/lib"
-	test -d $HOME/bz2/lib/bz2 &&    cf_search="$cf_search $HOME/bz2/lib/bz2"
-}
+done
 
 cf_search="$cf_library_path_list $cf_search"
 
@@ -35353,13 +34649,13 @@ cf_search="$cf_library_path_list $cf_search"
           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}:35356: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34652: 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 35362 "configure"
+#line 34658 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35376,21 +34672,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35379: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34675: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35382: \$? = $ac_status" >&5
+  echo "$as_me:34678: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35388: \$? = $ac_status" >&5
+  echo "$as_me:34684: \$? = $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}:35393: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34689: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
                 cf_cv_find_linkage_bz2=yes
                 cf_cv_library_file_bz2="-lbz2"
@@ -35449,7 +34745,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 35452 "configure"
+#line 34748 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35461,16 +34757,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35464: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34760: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35467: \$? = $ac_status" >&5
+  echo "$as_me:34763: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34766: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35473: \$? = $ac_status" >&5
+  echo "$as_me:34769: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35487,7 +34783,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:35490: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34786: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35521,7 +34817,7 @@ if test -n "$cf_cv_library_path_bz2" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:35524: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34820: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -35546,7 +34842,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:35549: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:34845: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -35557,7 +34853,7 @@ EOF
 
 fi
 
-echo "$as_me:35560: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:34856: 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.
@@ -35567,7 +34863,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:35570: result: $use_zlib" >&5
+echo "$as_me:34866: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -35606,7 +34902,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35609 "configure"
+#line 34905 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35618,16 +34914,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35621: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34917: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35624: \$? = $ac_status" >&5
+  echo "$as_me:34920: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35630: \$? = $ac_status" >&5
+  echo "$as_me:34926: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35644,7 +34940,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:35647: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34943: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35685,7 +34981,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35688 "configure"
+#line 34984 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35697,16 +34993,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35700: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34996: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35703: \$? = $ac_status" >&5
+  echo "$as_me:34999: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35709: \$? = $ac_status" >&5
+  echo "$as_me:35005: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35723,7 +35019,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:35726: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35022: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35739,7 +35035,7 @@ echo "${as_me:-configure}:35726: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:35742: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:35038: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35764,7 +35060,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:35767: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35063: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -35793,7 +35089,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:35796: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35092: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -35802,7 +35098,7 @@ echo "${as_me:-configure}:35796: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:35805: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:35101: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35816,12 +35112,12 @@ done
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me:-configure}:35819: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35115: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35824 "configure"
+#line 35120 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35837,16 +35133,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35840: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35136: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35843: \$? = $ac_status" >&5
+  echo "$as_me:35139: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35849: \$? = $ac_status" >&5
+  echo "$as_me:35145: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -35860,7 +35156,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35863 "configure"
+#line 35159 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35876,16 +35172,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35175: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35882: \$? = $ac_status" >&5
+  echo "$as_me:35178: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35888: \$? = $ac_status" >&5
+  echo "$as_me:35184: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -35902,9 +35198,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me:-configure}:35905: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:35201: testing find linkage for z library ..." 1>&5
 
-echo "${as_me:-configure}:35907: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35203: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -35941,17 +35237,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/zlib &&       cf_search="$cf_search /usr/include/zlib"
-	test -d /usr/include/zlib/include &&    cf_search="$cf_search /usr/include/zlib/include"
-	test -d /usr/zlib/include &&       cf_search="$cf_search /usr/zlib/include"
-	test -d /usr/zlib/include/zlib &&    cf_search="$cf_search /usr/zlib/include/zlib"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -35963,38 +35248,27 @@ test -d "$prefix" && \
 	test -d $prefix/zlib/include/zlib &&    cf_search="$cf_search $prefix/zlib/include/zlib"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/zlib &&       cf_search="$cf_search /usr/local/include/zlib"
-	test -d /usr/local/include/zlib/include &&    cf_search="$cf_search /usr/local/include/zlib/include"
-	test -d /usr/local/zlib/include &&       cf_search="$cf_search /usr/local/zlib/include"
-	test -d /usr/local/zlib/include/zlib &&    cf_search="$cf_search /usr/local/zlib/include/zlib"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/zlib &&       cf_search="$cf_search /opt/include/zlib"
-	test -d /opt/include/zlib/include &&    cf_search="$cf_search /opt/include/zlib/include"
-	test -d /opt/zlib/include &&       cf_search="$cf_search /opt/zlib/include"
-	test -d /opt/zlib/include/zlib &&    cf_search="$cf_search /opt/zlib/include/zlib"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/zlib &&       cf_search="$cf_search $cf_subdir_prefix/include/zlib"
+	test -d $cf_subdir_prefix/include/zlib/include &&    cf_search="$cf_search $cf_subdir_prefix/include/zlib/include"
+	test -d $cf_subdir_prefix/zlib/include &&       cf_search="$cf_search $cf_subdir_prefix/zlib/include"
+	test -d $cf_subdir_prefix/zlib/include/zlib &&    cf_search="$cf_search $cf_subdir_prefix/zlib/include/zlib"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/zlib &&       cf_search="$cf_search $HOME/include/zlib"
-	test -d $HOME/include/zlib/include &&    cf_search="$cf_search $HOME/include/zlib/include"
-	test -d $HOME/zlib/include &&       cf_search="$cf_search $HOME/zlib/include"
-	test -d $HOME/zlib/include/zlib &&    cf_search="$cf_search $HOME/zlib/include/zlib"
-}
+done
 
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
@@ -36017,11 +35291,11 @@ cf_search="$cf_search $cf_header_path_list"
       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}:36020: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:35294: 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 36024 "configure"
+#line 35298 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -36037,21 +35311,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:36040: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35314: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36043: \$? = $ac_status" >&5
+  echo "$as_me:35317: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:36046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36049: \$? = $ac_status" >&5
+  echo "$as_me:35323: \$? = $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}:36054: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:35328: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
             cf_cv_find_linkage_z=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -36069,7 +35343,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me:-configure}:36072: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35346: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -36077,7 +35351,7 @@ echo "${as_me:-configure}:36072: testing Searching for z library in FIND_LINKAGE
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lz  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 36080 "configure"
+#line 35354 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -36093,21 +35367,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36096: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35370: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36099: \$? = $ac_status" >&5
+  echo "$as_me:35373: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36105: \$? = $ac_status" >&5
+  echo "$as_me:35379: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me:-configure}:36110: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:35384: testing ... found z library in system ..." 1>&5
 
             cf_cv_find_linkage_z=yes
 else
@@ -36148,17 +35422,6 @@ fi
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/z &&       cf_search="$cf_search /usr/lib/z"
-	test -d /usr/lib/z/lib &&    cf_search="$cf_search /usr/lib/z/lib"
-	test -d /usr/z/lib &&       cf_search="$cf_search /usr/z/lib"
-	test -d /usr/z/lib/z &&    cf_search="$cf_search /usr/z/lib/z"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -36170,38 +35433,27 @@ test -d "$prefix" && \
 	test -d $prefix/z/lib/z &&    cf_search="$cf_search $prefix/z/lib/z"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/z &&       cf_search="$cf_search /usr/local/lib/z"
-	test -d /usr/local/lib/z/lib &&    cf_search="$cf_search /usr/local/lib/z/lib"
-	test -d /usr/local/z/lib &&       cf_search="$cf_search /usr/local/z/lib"
-	test -d /usr/local/z/lib/z &&    cf_search="$cf_search /usr/local/z/lib/z"
-}
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
 
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/z &&       cf_search="$cf_search /opt/lib/z"
-	test -d /opt/lib/z/lib &&    cf_search="$cf_search /opt/lib/z/lib"
-	test -d /opt/z/lib &&       cf_search="$cf_search /opt/z/lib"
-	test -d /opt/z/lib/z &&    cf_search="$cf_search /opt/z/lib/z"
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/z &&       cf_search="$cf_search $cf_subdir_prefix/lib/z"
+	test -d $cf_subdir_prefix/lib/z/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/z/lib"
+	test -d $cf_subdir_prefix/z/lib &&       cf_search="$cf_search $cf_subdir_prefix/z/lib"
+	test -d $cf_subdir_prefix/z/lib/z &&    cf_search="$cf_search $cf_subdir_prefix/z/lib/z"
 }
 
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/z &&       cf_search="$cf_search $HOME/lib/z"
-	test -d $HOME/lib/z/lib &&    cf_search="$cf_search $HOME/lib/z/lib"
-	test -d $HOME/z/lib &&       cf_search="$cf_search $HOME/z/lib"
-	test -d $HOME/z/lib/z &&    cf_search="$cf_search $HOME/z/lib/z"
-}
+done
 
 cf_search="$cf_library_path_list $cf_search"
 
@@ -36210,13 +35462,13 @@ cf_search="$cf_library_path_list $cf_search"
           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}:36213: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:35465: 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 36219 "configure"
+#line 35471 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -36232,21 +35484,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36235: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35487: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36238: \$? = $ac_status" >&5
+  echo "$as_me:35490: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36244: \$? = $ac_status" >&5
+  echo "$as_me:35496: \$? = $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}:36249: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:35501: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
                 cf_cv_find_linkage_z=yes
                 cf_cv_library_file_z="-lz"
@@ -36305,7 +35557,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 36308 "configure"
+#line 35560 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -36317,16 +35569,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:36320: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35572: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36323: \$? = $ac_status" >&5
+  echo "$as_me:35575: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:36326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36329: \$? = $ac_status" >&5
+  echo "$as_me:35581: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -36343,7 +35595,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:36346: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35598: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -36377,7 +35629,7 @@ if test -n "$cf_cv_library_path_z" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:36380: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35632: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -36402,7 +35654,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:36405: WARNING: Cannot find z library" >&5
+{ echo "$as_me:35657: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -36411,13 +35663,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:36414: checking for $ac_func" >&5
+echo "$as_me:35666: 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 36420 "configure"
+#line 35672 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -36448,16 +35700,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36451: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35703: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36454: \$? = $ac_status" >&5
+  echo "$as_me:35706: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36457: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36460: \$? = $ac_status" >&5
+  echo "$as_me:35712: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -36467,7 +35719,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36470: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:35722: 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
@@ -36484,7 +35736,7 @@ EOF
 
 fi
 
-echo "$as_me:36487: checking if you want to exclude FINGER code" >&5
+echo "$as_me:35739: 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.
@@ -36501,14 +35753,14 @@ else
   use_finger=no
 
 fi;
-echo "$as_me:36504: result: $use_finger" >&5
+echo "$as_me:35756: 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:36511: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:35763: 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.
@@ -36525,14 +35777,14 @@ else
   use_gopher=no
 
 fi;
-echo "$as_me:36528: result: $use_gopher" >&5
+echo "$as_me:35780: 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:36535: checking if you want to exclude NEWS code" >&5
+echo "$as_me:35787: 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.
@@ -36549,14 +35801,14 @@ else
   use_news=no
 
 fi;
-echo "$as_me:36552: result: $use_news" >&5
+echo "$as_me:35804: 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:36559: checking if you want to exclude FTP code" >&5
+echo "$as_me:35811: 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.
@@ -36573,14 +35825,14 @@ else
   use_ftp=no
 
 fi;
-echo "$as_me:36576: result: $use_ftp" >&5
+echo "$as_me:35828: result: $use_ftp" >&5
 echo "${ECHO_T}$use_ftp" >&6
 test $use_ftp != "no" &&
 cat >>confdefs.h <<\EOF
 #define DISABLE_FTP 1
 EOF
 
-echo "$as_me:36583: checking if you want to include WAIS code" >&5
+echo "$as_me:35835: checking if you want to include WAIS code" >&5
 echo $ECHO_N "checking if you want to include WAIS code... $ECHO_C" >&6
 
 # Check whether --enable-wais or --disable-wais was given.
@@ -36597,13 +35849,13 @@ else
   use_wais=no
 
 fi;
-echo "$as_me:36600: result: $use_wais" >&5
+echo "$as_me:35852: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test $use_wais != "no"
 then
-	echo "$as_me:36606: checking for fs_free in -lwais" >&5
+	echo "$as_me:35858: checking for fs_free in -lwais" >&5
 echo $ECHO_N "checking for fs_free in -lwais... $ECHO_C" >&6
 if test "${ac_cv_lib_wais_fs_free+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -36611,7 +35863,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36614 "configure"
+#line 35866 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36630,16 +35882,16 @@ fs_free ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36633: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35885: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36636: \$? = $ac_status" >&5
+  echo "$as_me:35888: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36642: \$? = $ac_status" >&5
+  echo "$as_me:35894: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -36650,18 +35902,18 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36653: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:35905: result: $ac_cv_lib_wais_fs_free" >&5
 echo "${ECHO_T}$ac_cv_lib_wais_fs_free" >&6
 if test $ac_cv_lib_wais_fs_free = yes; then
 
-echo "$as_me:36657: checking if -lm needed for math functions" >&5
+echo "$as_me:35909: checking if -lm needed for math functions" >&5
 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
 if test "${cf_cv_need_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 36664 "configure"
+#line 35916 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -36676,16 +35928,16 @@ double x = rand(); printf("result = %g\n", sin(x))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36679: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35931: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36682: \$? = $ac_status" >&5
+  echo "$as_me:35934: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36688: \$? = $ac_status" >&5
+  echo "$as_me:35940: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
@@ -36695,7 +35947,7 @@ cf_cv_need_libm=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36698: result: $cf_cv_need_libm" >&5
+echo "$as_me:35950: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
@@ -36737,23 +35989,23 @@ LIBS="$cf_add_libs"
 for ac_header in wais.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:36740: checking for $ac_header" >&5
+echo "$as_me:35992: 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 36746 "configure"
+#line 35998 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:36750: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:36002: \"$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:36756: \$? = $ac_status" >&5
+  echo "$as_me:36008: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -36772,7 +36024,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:36775: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:36027: 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
@@ -36785,7 +36037,7 @@ done
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:36788: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:36040: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -36793,7 +36045,7 @@ fi
 
 # 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:36796: checking if directory-editor code should be used" >&5
+echo "$as_me:36048: 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.
@@ -36810,7 +36062,7 @@ else
   use_dired=yes
 
 fi;
-echo "$as_me:36813: result: $use_dired" >&5
+echo "$as_me:36065: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -36820,7 +36072,7 @@ cat >>confdefs.h <<\EOF
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:36823: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:36075: 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.
@@ -36837,10 +36089,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:36840: result: $enableval" >&5
+	echo "$as_me:36092: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36843: checking if DirEd mode should override keys" >&5
+	echo "$as_me:36095: 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.
@@ -36864,10 +36116,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36867: result: $enableval" >&5
+	echo "$as_me:36119: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36870: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:36122: 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.
@@ -36891,10 +36143,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36894: result: $enableval" >&5
+	echo "$as_me:36146: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36897: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:36149: 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.
@@ -36911,10 +36163,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:36914: result: $enableval" >&5
+	echo "$as_me:36166: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36917: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:36169: 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.
@@ -36938,10 +36190,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36941: result: $enableval" >&5
+	echo "$as_me:36193: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36944: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:36196: 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.
@@ -36965,10 +36217,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36968: result: $enableval" >&5
+	echo "$as_me:36220: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36971: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:36223: 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.
@@ -36992,10 +36244,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36995: result: $enableval" >&5
+	echo "$as_me:36247: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36998: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:36250: 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.
@@ -37019,11 +36271,11 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:37022: result: $enableval" >&5
+	echo "$as_me:36274: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:37026: checking if you want long-directory listings" >&5
+echo "$as_me:36278: 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.
@@ -37047,10 +36299,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-echo "$as_me:37050: result: $enableval" >&5
+echo "$as_me:36302: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:37053: checking if parent-directory references are permitted" >&5
+echo "$as_me:36305: 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.
@@ -37067,7 +36319,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:37070: result: $enableval" >&5
+echo "$as_me:36322: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -37075,7 +36327,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:37078: checking for $ac_word" >&5
+echo "$as_me:36330: 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
@@ -37092,7 +36344,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:37095: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36347: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37103,10 +36355,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:37106: result: $TELNET" >&5
+  echo "$as_me:36358: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:37109: result: no" >&5
+  echo "$as_me:36361: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37165,7 +36417,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37168: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36420: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -37183,7 +36435,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:37186: checking for $ac_word" >&5
+echo "$as_me:36438: 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
@@ -37200,7 +36452,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:37203: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36455: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37211,10 +36463,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:37214: result: $TN3270" >&5
+  echo "$as_me:36466: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:37217: result: no" >&5
+  echo "$as_me:36469: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37273,7 +36525,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37276: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36528: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -37291,7 +36543,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:37294: checking for $ac_word" >&5
+echo "$as_me:36546: 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
@@ -37308,7 +36560,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:37311: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36563: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37319,10 +36571,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:37322: result: $RLOGIN" >&5
+  echo "$as_me:36574: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:37325: result: no" >&5
+  echo "$as_me:36577: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37381,7 +36633,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37384: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36636: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -37399,7 +36651,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:37402: checking for $ac_word" >&5
+echo "$as_me:36654: 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
@@ -37416,7 +36668,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:37419: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36671: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37427,10 +36679,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:37430: result: $MV" >&5
+  echo "$as_me:36682: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:37433: result: no" >&5
+  echo "$as_me:36685: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37489,7 +36741,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37492: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36744: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -37507,7 +36759,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:37510: checking for $ac_word" >&5
+echo "$as_me:36762: 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
@@ -37524,7 +36776,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:37527: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36779: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37535,10 +36787,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:37538: result: $GZIP" >&5
+  echo "$as_me:36790: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:37541: result: no" >&5
+  echo "$as_me:36793: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37597,7 +36849,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37600: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36852: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -37615,7 +36867,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:37618: checking for $ac_word" >&5
+echo "$as_me:36870: 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
@@ -37632,7 +36884,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:37635: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36887: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37643,10 +36895,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:37646: result: $UNCOMPRESS" >&5
+  echo "$as_me:36898: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:37649: result: no" >&5
+  echo "$as_me:36901: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37705,7 +36957,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37708: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36960: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -37723,7 +36975,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:37726: checking for $ac_word" >&5
+echo "$as_me:36978: 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
@@ -37740,7 +36992,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:37743: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36995: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37751,10 +37003,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:37754: result: $UNZIP" >&5
+  echo "$as_me:37006: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:37757: result: no" >&5
+  echo "$as_me:37009: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37813,7 +37065,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37816: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37068: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -37831,7 +37083,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:37834: checking for $ac_word" >&5
+echo "$as_me:37086: 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
@@ -37848,7 +37100,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:37851: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37103: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37859,10 +37111,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:37862: result: $BZIP2" >&5
+  echo "$as_me:37114: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:37865: result: no" >&5
+  echo "$as_me:37117: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37921,7 +37173,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37924: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37176: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -37939,7 +37191,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:37942: checking for $ac_word" >&5
+echo "$as_me:37194: 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
@@ -37956,7 +37208,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:37959: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37211: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37967,10 +37219,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:37970: result: $TAR" >&5
+  echo "$as_me:37222: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:37973: result: no" >&5
+  echo "$as_me:37225: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38029,7 +37281,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38032: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37284: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -38087,7 +37339,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:38090: checking for $ac_word" >&5
+echo "$as_me:37342: 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
@@ -38104,7 +37356,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:38107: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37359: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38115,10 +37367,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:38118: result: $COMPRESS" >&5
+  echo "$as_me:37370: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:38121: result: no" >&5
+  echo "$as_me:37373: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38177,7 +37429,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38180: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37432: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -38195,7 +37447,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:38198: checking for $ac_word" >&5
+echo "$as_me:37450: 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
@@ -38212,7 +37464,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:38215: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37467: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38223,10 +37475,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:38226: result: $RM" >&5
+  echo "$as_me:37478: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:38229: result: no" >&5
+  echo "$as_me:37481: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38285,7 +37537,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38288: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37540: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -38303,7 +37555,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:38306: checking for $ac_word" >&5
+echo "$as_me:37558: 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
@@ -38320,7 +37572,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:38323: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37575: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38331,10 +37583,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:38334: result: $UUDECODE" >&5
+  echo "$as_me:37586: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:38337: result: no" >&5
+  echo "$as_me:37589: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38393,7 +37645,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38396: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37648: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -38411,7 +37663,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:38414: checking for $ac_word" >&5
+echo "$as_me:37666: 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
@@ -38428,7 +37680,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:38431: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37683: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38439,10 +37691,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:38442: result: $ZCAT" >&5
+  echo "$as_me:37694: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:38445: result: no" >&5
+  echo "$as_me:37697: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38501,7 +37753,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38504: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37756: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -38519,7 +37771,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:38522: checking for $ac_word" >&5
+echo "$as_me:37774: 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
@@ -38536,7 +37788,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:38539: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37791: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38547,10 +37799,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:38550: result: $ZIP" >&5
+  echo "$as_me:37802: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:38553: result: no" >&5
+  echo "$as_me:37805: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38609,7 +37861,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38612: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37864: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -38637,7 +37889,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:38640: checking for $ac_word" >&5
+echo "$as_me:37892: 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
@@ -38654,7 +37906,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:38657: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37909: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38665,10 +37917,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:38668: result: $INSTALL" >&5
+  echo "$as_me:37920: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:38671: result: no" >&5
+  echo "$as_me:37923: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38727,7 +37979,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38730: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37982: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -38757,7 +38009,7 @@ if test $cf_cv_screen = pdcurses ; then
 	case $host_os in #(vi
 	mingw*)
 
-echo "$as_me:38760: checking for initscr in -lpdcurses" >&5
+echo "$as_me:38012: checking for initscr in -lpdcurses" >&5
 echo $ECHO_N "checking for initscr in -lpdcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_pdcurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38765,7 +38017,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpdcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38768 "configure"
+#line 38020 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38784,16 +38036,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38787: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38039: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38790: \$? = $ac_status" >&5
+  echo "$as_me:38042: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38793: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38796: \$? = $ac_status" >&5
+  echo "$as_me:38048: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_pdcurses_initscr=yes
 else
@@ -38804,7 +38056,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38807: result: $ac_cv_lib_pdcurses_initscr" >&5
+echo "$as_me:38059: result: $ac_cv_lib_pdcurses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_pdcurses_initscr" >&6
 if test $ac_cv_lib_pdcurses_initscr = yes; then
 
@@ -38826,13 +38078,13 @@ LIBS="$cf_add_libs"
 
 	cf_cv_term_header=no
 	cf_cv_unctrl_header=no
-	echo "$as_me:38829: checking for winwstr" >&5
+	echo "$as_me:38081: checking for winwstr" >&5
 echo $ECHO_N "checking for winwstr... $ECHO_C" >&6
 if test "${ac_cv_func_winwstr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 38835 "configure"
+#line 38087 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char winwstr (); below.  */
@@ -38863,16 +38115,16 @@ f = winwstr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38866: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38869: \$? = $ac_status" >&5
+  echo "$as_me:38121: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38875: \$? = $ac_status" >&5
+  echo "$as_me:38127: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_winwstr=yes
 else
@@ -38882,7 +38134,7 @@ ac_cv_func_winwstr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38885: result: $ac_cv_func_winwstr" >&5
+echo "$as_me:38137: result: $ac_cv_func_winwstr" >&5
 echo "${ECHO_T}$ac_cv_func_winwstr" >&6
 if test $ac_cv_func_winwstr = yes; then
   cat >>confdefs.h <<\EOF
@@ -38891,13 +38143,13 @@ EOF
 
 fi
 
-	echo "$as_me:38894: checking for pdcurses_dll_iname" >&5
+	echo "$as_me:38146: checking for pdcurses_dll_iname" >&5
 echo $ECHO_N "checking for pdcurses_dll_iname... $ECHO_C" >&6
 if test "${ac_cv_func_pdcurses_dll_iname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 38900 "configure"
+#line 38152 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pdcurses_dll_iname (); below.  */
@@ -38928,16 +38180,16 @@ f = pdcurses_dll_iname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38931: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38183: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38934: \$? = $ac_status" >&5
+  echo "$as_me:38186: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38940: \$? = $ac_status" >&5
+  echo "$as_me:38192: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_pdcurses_dll_iname=yes
 else
@@ -38947,7 +38199,7 @@ ac_cv_func_pdcurses_dll_iname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38950: result: $ac_cv_func_pdcurses_dll_iname" >&5
+echo "$as_me:38202: result: $ac_cv_func_pdcurses_dll_iname" >&5
 echo "${ECHO_T}$ac_cv_func_pdcurses_dll_iname" >&6
 if test $ac_cv_func_pdcurses_dll_iname = yes; then
   cat >>confdefs.h <<\EOF
@@ -38960,7 +38212,7 @@ fi
 
 		;;
 	*) #(vi
-		echo "$as_me:38963: checking for X" >&5
+		echo "$as_me:38215: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -39057,17 +38309,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 39060 "configure"
+#line 38312 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:39064: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:38316: \"$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:39070: \$? = $ac_status" >&5
+  echo "$as_me:38322: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -39100,7 +38352,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 39103 "configure"
+#line 38355 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -39112,16 +38364,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39115: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38367: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39118: \$? = $ac_status" >&5
+  echo "$as_me:38370: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38373: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39124: \$? = $ac_status" >&5
+  echo "$as_me:38376: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -39159,7 +38411,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:39162: result: $have_x" >&5
+  echo "$as_me:38414: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -39169,7 +38421,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:39172: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:38424: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -39193,11 +38445,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:39196: checking whether -R must be followed by a space" >&5
+      echo "$as_me:38448: 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 39200 "configure"
+#line 38452 "configure"
 #include "confdefs.h"
 
 int
@@ -39209,16 +38461,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39212: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38464: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39215: \$? = $ac_status" >&5
+  echo "$as_me:38467: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39221: \$? = $ac_status" >&5
+  echo "$as_me:38473: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -39228,13 +38480,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:39231: result: no" >&5
+	echo "$as_me:38483: 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 39237 "configure"
+#line 38489 "configure"
 #include "confdefs.h"
 
 int
@@ -39246,16 +38498,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39249: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39252: \$? = $ac_status" >&5
+  echo "$as_me:38504: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39258: \$? = $ac_status" >&5
+  echo "$as_me:38510: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -39265,11 +38517,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:39268: result: yes" >&5
+	  echo "$as_me:38520: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:39272: result: neither works" >&5
+	  echo "$as_me:38524: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -39289,7 +38541,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 39292 "configure"
+#line 38544 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39308,22 +38560,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39311: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38563: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39314: \$? = $ac_status" >&5
+  echo "$as_me:38566: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38569: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39320: \$? = $ac_status" >&5
+  echo "$as_me:38572: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:39326: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:38578: 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
@@ -39331,7 +38583,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39334 "configure"
+#line 38586 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39350,16 +38602,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39353: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38605: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39356: \$? = $ac_status" >&5
+  echo "$as_me:38608: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39362: \$? = $ac_status" >&5
+  echo "$as_me:38614: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -39370,14 +38622,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39373: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:38625: 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:39380: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:38632: 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
@@ -39385,7 +38637,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39388 "configure"
+#line 38640 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39404,16 +38656,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38659: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39410: \$? = $ac_status" >&5
+  echo "$as_me:38662: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39416: \$? = $ac_status" >&5
+  echo "$as_me:38668: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -39424,7 +38676,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39427: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:38679: 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"
@@ -39443,13 +38695,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:39446: checking for gethostbyname" >&5
+    echo "$as_me:38698: 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 39452 "configure"
+#line 38704 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -39480,16 +38732,16 @@ f = gethostbyname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38735: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39486: \$? = $ac_status" >&5
+  echo "$as_me:38738: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38741: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39492: \$? = $ac_status" >&5
+  echo "$as_me:38744: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -39499,11 +38751,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39502: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:38754: 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:39506: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:38758: 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
@@ -39511,7 +38763,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39514 "configure"
+#line 38766 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39530,16 +38782,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39533: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38785: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39536: \$? = $ac_status" >&5
+  echo "$as_me:38788: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39542: \$? = $ac_status" >&5
+  echo "$as_me:38794: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -39550,14 +38802,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39553: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:38805: 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:39560: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:38812: 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
@@ -39565,7 +38817,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39568 "configure"
+#line 38820 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39584,16 +38836,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39587: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38839: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39590: \$? = $ac_status" >&5
+  echo "$as_me:38842: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39596: \$? = $ac_status" >&5
+  echo "$as_me:38848: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -39604,7 +38856,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39607: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:38859: 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"
@@ -39620,13 +38872,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:39623: checking for connect" >&5
+    echo "$as_me:38875: 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 39629 "configure"
+#line 38881 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -39657,16 +38909,16 @@ f = connect; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39660: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38912: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39663: \$? = $ac_status" >&5
+  echo "$as_me:38915: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39669: \$? = $ac_status" >&5
+  echo "$as_me:38921: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -39676,11 +38928,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39679: result: $ac_cv_func_connect" >&5
+echo "$as_me:38931: 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:39683: checking for connect in -lsocket" >&5
+      echo "$as_me:38935: 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
@@ -39688,7 +38940,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39691 "configure"
+#line 38943 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39707,16 +38959,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39710: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38962: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39713: \$? = $ac_status" >&5
+  echo "$as_me:38965: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39719: \$? = $ac_status" >&5
+  echo "$as_me:38971: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -39727,7 +38979,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39730: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:38982: 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"
@@ -39736,13 +38988,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:39739: checking for remove" >&5
+    echo "$as_me:38991: 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 39745 "configure"
+#line 38997 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -39773,16 +39025,16 @@ f = remove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39776: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39028: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39779: \$? = $ac_status" >&5
+  echo "$as_me:39031: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39785: \$? = $ac_status" >&5
+  echo "$as_me:39037: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -39792,11 +39044,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39795: result: $ac_cv_func_remove" >&5
+echo "$as_me:39047: 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:39799: checking for remove in -lposix" >&5
+      echo "$as_me:39051: 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
@@ -39804,7 +39056,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39807 "configure"
+#line 39059 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39823,16 +39075,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39826: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39078: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39829: \$? = $ac_status" >&5
+  echo "$as_me:39081: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39835: \$? = $ac_status" >&5
+  echo "$as_me:39087: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -39843,7 +39095,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39846: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:39098: 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"
@@ -39852,13 +39104,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:39855: checking for shmat" >&5
+    echo "$as_me:39107: 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 39861 "configure"
+#line 39113 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -39889,16 +39141,16 @@ f = shmat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39892: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39144: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39895: \$? = $ac_status" >&5
+  echo "$as_me:39147: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39901: \$? = $ac_status" >&5
+  echo "$as_me:39153: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -39908,11 +39160,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39911: result: $ac_cv_func_shmat" >&5
+echo "$as_me:39163: 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:39915: checking for shmat in -lipc" >&5
+      echo "$as_me:39167: 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
@@ -39920,7 +39172,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39923 "configure"
+#line 39175 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39939,16 +39191,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39942: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39194: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39945: \$? = $ac_status" >&5
+  echo "$as_me:39197: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39951: \$? = $ac_status" >&5
+  echo "$as_me:39203: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -39959,7 +39211,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39962: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:39214: 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"
@@ -39977,7 +39229,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:39980: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:39232: 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
@@ -39985,7 +39237,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39988 "configure"
+#line 39240 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40004,16 +39256,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40007: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39259: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40010: \$? = $ac_status" >&5
+  echo "$as_me:39262: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40013: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40016: \$? = $ac_status" >&5
+  echo "$as_me:39268: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -40024,7 +39276,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40027: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:39279: 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"
@@ -40036,7 +39288,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:40039: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:39291: 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=
 
@@ -40047,14 +39299,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:40050: result: yes" >&5
+	echo "$as_me:39302: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:40053: result: no" >&5
+	echo "$as_me:39305: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:40057: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:39309: checking if you want to link with Xaw 3d xft library" >&5
 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
 withval=
 
@@ -40065,14 +39317,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:40068: result: yes" >&5
+	echo "$as_me:39320: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:40071: result: no" >&5
+	echo "$as_me:39323: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:40075: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:39327: 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=
 
@@ -40083,14 +39335,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:40086: result: yes" >&5
+	echo "$as_me:39338: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:40089: result: no" >&5
+	echo "$as_me:39341: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:40093: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:39345: 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=
 
@@ -40101,10 +39353,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:40104: result: yes" >&5
+	echo "$as_me:39356: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:40107: result: no" >&5
+	echo "$as_me:39359: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -40124,17 +39376,17 @@ if test "$PKG_CONFIG" != none ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
 
-echo "${as_me:-configure}:40127: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:39379: testing found package $cf_athena_pkg ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   $cf_athena_pkg 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40133: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39385: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40137: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39389: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40245,20 +39497,20 @@ EOF
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:40248: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:39500: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:40254: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:39506: checking for usable $cf_x_athena/Xmu package" >&5
 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
 if test "${cf_cv_xaw_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 40261 "configure"
+#line 39513 "configure"
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
@@ -40274,16 +39526,16 @@ int check = XmuCompareISOLatin1("big", "small")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40277: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39529: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40280: \$? = $ac_status" >&5
+  echo "$as_me:39532: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40286: \$? = $ac_status" >&5
+  echo "$as_me:39538: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -40293,7 +39545,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40296: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:39548: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -40305,7 +39557,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:40308: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:39560: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -40313,17 +39565,17 @@ echo "${as_me:-configure}:40308: testing work around broken package ..." 1>&5
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
 	test -n "$verbose" && echo "	found package xmu" 1>&6
 
-echo "${as_me:-configure}:40316: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:39568: testing found package xmu ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xmu 2>/dev/null`"
 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40322: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39574: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40326: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39578: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40423,12 +39675,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:40426: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:39678: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:40431: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:39683: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -40436,12 +39688,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:40439: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:39691: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:40444: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:39696: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -40452,7 +39704,7 @@ fi
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:40455: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:39707: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -40477,17 +39729,17 @@ if test -z "$cf_x_athena_lib" ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:40480: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:39732: testing found package Xext ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   Xext 2>/dev/null`"
 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40486: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39738: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40490: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39742: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40588,7 +39840,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:40591: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:39843: 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
@@ -40596,7 +39848,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40599 "configure"
+#line 39851 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40615,16 +39867,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40618: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39870: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40621: \$? = $ac_status" >&5
+  echo "$as_me:39873: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39876: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40627: \$? = $ac_status" >&5
+  echo "$as_me:39879: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -40635,7 +39887,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40638: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:39890: 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
 
@@ -40671,17 +39923,17 @@ then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:40674: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:39926: testing found package x11 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40680: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39932: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40684: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39936: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40781,24 +40033,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40784: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:40036: WARNING: unable to find X11 library" >&5
 echo "$as_me: WARNING: unable to find X11 library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
 	test -n "$verbose" && echo "	found package ice" 1>&6
 
-echo "${as_me:-configure}:40791: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:40043: testing found package ice ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40797: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40049: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40801: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40053: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40898,24 +40150,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40901: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:40153: WARNING: unable to find ICE library" >&5
 echo "$as_me: WARNING: unable to find ICE library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:40908: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:40160: testing found package sm ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40914: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40166: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40918: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40170: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41015,24 +40267,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:41018: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:40270: WARNING: unable to find SM library" >&5
 echo "$as_me: WARNING: unable to find SM library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:41025: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:40277: testing found package xt ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:41031: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40283: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:41035: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40287: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41132,7 +40384,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:41135: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:40387: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -41143,17 +40395,17 @@ cf_have_X_LIBS=no
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:41146: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:40398: testing found package xt ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:41152: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40404: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:41156: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40408: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41254,14 +40506,14 @@ LIBS="$cf_add_libs"
 		;;
 	*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:41257: checking for usable X dependency" >&5
+echo "$as_me:40509: checking for usable X dependency" >&5
 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
 if test "${cf_cv_xt_x11_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 41264 "configure"
+#line 40516 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -41280,16 +40532,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41283: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40535: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41286: \$? = $ac_status" >&5
+  echo "$as_me:40538: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40541: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41292: \$? = $ac_status" >&5
+  echo "$as_me:40544: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -41299,30 +40551,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:41302: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:40554: result: $cf_cv_xt_x11_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
 		if test "$cf_cv_xt_x11_compat" = no
 		then
 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
 
-echo "${as_me:-configure}:41308: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:40560: testing work around broken X11 dependency ..." 1>&5
 
 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:41315: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:40567: testing found package x11 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:41321: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40573: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:41325: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40577: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41425,12 +40677,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:41428: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:40680: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:41433: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:40685: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -41438,14 +40690,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:41441: checking for usable X Toolkit package" >&5
+echo "$as_me:40693: checking for usable X Toolkit package" >&5
 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
 if test "${cf_cv_xt_ice_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 41448 "configure"
+#line 40700 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
@@ -41460,16 +40712,16 @@ int num = IceConnectionNumber(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41463: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40715: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41466: \$? = $ac_status" >&5
+  echo "$as_me:40718: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41472: \$? = $ac_status" >&5
+  echo "$as_me:40724: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -41479,7 +40731,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:41482: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:40734: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -41493,22 +40745,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 			*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:41496: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:40748: testing work around broken ICE dependency ..." 1>&5
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
 	test -n "$verbose" && echo "	found package ice" 1>&6
 
-echo "${as_me:-configure}:41501: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:40753: testing found package ice ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:41507: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40759: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:41511: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40763: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41607,17 +40859,17 @@ LIBS="$cf_add_libs"
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:41610: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:40862: testing found package sm ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:41616: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40868: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:41620: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40872: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41726,12 +40978,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:41729: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:40981: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:41734: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:40986: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -41751,7 +41003,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:41754: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41006: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -41822,7 +41074,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}:41825: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:41077: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -41830,7 +41082,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}:41833: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:41085: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -41838,14 +41090,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}:41841: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:41093: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 41848 "configure"
+#line 41100 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41857,16 +41109,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41860: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41112: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41863: \$? = $ac_status" >&5
+  echo "$as_me:41115: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41118: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41869: \$? = $ac_status" >&5
+  echo "$as_me:41121: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -41874,12 +41126,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:41877: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41129: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:41882: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:41134: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -41887,13 +41139,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-	echo "$as_me:41890: checking for XOpenDisplay" >&5
+	echo "$as_me:41142: 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 41896 "configure"
+#line 41148 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -41924,16 +41176,16 @@ f = XOpenDisplay; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41927: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41179: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41930: \$? = $ac_status" >&5
+  echo "$as_me:41182: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41933: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41936: \$? = $ac_status" >&5
+  echo "$as_me:41188: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -41943,13 +41195,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:41946: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:41198: 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:41952: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:41204: 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
@@ -41957,7 +41209,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 41960 "configure"
+#line 41212 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -41976,16 +41228,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41979: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41231: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41982: \$? = $ac_status" >&5
+  echo "$as_me:41234: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41988: \$? = $ac_status" >&5
+  echo "$as_me:41240: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -41996,7 +41248,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:41999: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:41251: 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
 
@@ -42020,13 +41272,13 @@ fi
 
 fi
 
-	echo "$as_me:42023: checking for XtAppInitialize" >&5
+	echo "$as_me:41275: 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 42029 "configure"
+#line 41281 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -42057,16 +41309,16 @@ f = XtAppInitialize; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42060: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41312: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42063: \$? = $ac_status" >&5
+  echo "$as_me:41315: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42066: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42069: \$? = $ac_status" >&5
+  echo "$as_me:41321: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -42076,13 +41328,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:42079: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:41331: 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:42085: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:41337: 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
@@ -42090,7 +41342,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 42093 "configure"
+#line 41345 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -42109,16 +41361,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42112: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41364: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42115: \$? = $ac_status" >&5
+  echo "$as_me:41367: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42118: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42121: \$? = $ac_status" >&5
+  echo "$as_me:41373: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -42129,7 +41381,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:42132: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:41384: 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
 
@@ -42146,7 +41398,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:42149: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:41401: 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
@@ -42168,14 +41420,14 @@ do
 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
 			CPPFLAGS="$cf_save -I$cf_path/include"
-			echo "$as_me:42171: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:41423: 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:42174: checking for $cf_test" >&5
+			echo "$as_me:41426: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 42178 "configure"
+#line 41430 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -42189,16 +41441,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42192: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41444: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42195: \$? = $ac_status" >&5
+  echo "$as_me:41447: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42201: \$? = $ac_status" >&5
+  echo "$as_me:41453: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -42207,7 +41459,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:42210: result: $cf_result" >&5
+		echo "$as_me:41462: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_inc=$cf_path
@@ -42219,7 +41471,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:42222: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:41474: 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_inc" != default ; then
 	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc"
@@ -42265,7 +41517,7 @@ do
 done
 LIBS="$cf_add_libs"
 
-				echo "$as_me:42268: checking for $cf_libs in $cf_path" >&5
+				echo "$as_me:41520: checking for $cf_libs in $cf_path" >&5
 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
 			else
 
@@ -42285,11 +41537,11 @@ do
 done
 LIBS="$cf_add_libs"
 
-				echo "$as_me:42288: checking for $cf_test in $cf_libs" >&5
+				echo "$as_me:41540: checking for $cf_test in $cf_libs" >&5
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
 			fi
 			cat >conftest.$ac_ext <<_ACEOF
-#line 42292 "configure"
+#line 41544 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -42305,16 +41557,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42308: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41560: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42311: \$? = $ac_status" >&5
+  echo "$as_me:41563: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42314: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42317: \$? = $ac_status" >&5
+  echo "$as_me:41569: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -42323,7 +41575,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:42326: result: $cf_result" >&5
+			echo "$as_me:41578: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_libs"
@@ -42337,7 +41589,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:42340: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:41592: 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
@@ -42355,7 +41607,7 @@ if test -n "$ac_tool_prefix"; 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:42358: checking for $ac_word" >&5
+echo "$as_me:41610: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -42370,7 +41622,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_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:42373: found $ac_dir/$ac_word" >&5
+echo "$as_me:41625: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -42378,10 +41630,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:42381: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:41633: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:42384: result: no" >&5
+  echo "$as_me:41636: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -42394,7 +41646,7 @@ if test -z "$XCURSES_CONFIG"; 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:42397: checking for $ac_word" >&5
+echo "$as_me:41649: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -42409,7 +41661,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_XCURSES_CONFIG="$ac_prog"
-echo "$as_me:42412: found $ac_dir/$ac_word" >&5
+echo "$as_me:41664: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -42417,10 +41669,10 @@ fi
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then
-  echo "$as_me:42420: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:41672: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:42423: result: no" >&5
+  echo "$as_me:41675: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -42459,7 +41711,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:42462: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41714: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -42530,7 +41782,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}:42533: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:41785: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -42538,7 +41790,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}:42541: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:41793: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -42546,14 +41798,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}:42549: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:41801: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 42556 "configure"
+#line 41808 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42565,16 +41817,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41820: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42571: \$? = $ac_status" >&5
+  echo "$as_me:41823: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41826: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42577: \$? = $ac_status" >&5
+  echo "$as_me:41829: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -42582,12 +41834,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:42585: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41837: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:42590: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:41842: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -42595,7 +41847,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:42598: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:41850: 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
@@ -42603,7 +41855,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 42606 "configure"
+#line 41858 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -42622,16 +41874,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41877: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42628: \$? = $ac_status" >&5
+  echo "$as_me:41880: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41883: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42634: \$? = $ac_status" >&5
+  echo "$as_me:41886: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -42642,7 +41894,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:42645: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:41897: 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
 
@@ -42664,7 +41916,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:42667: checking for XCurses library" >&5
+echo "$as_me:41919: 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
@@ -42687,7 +41939,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 42690 "configure"
+#line 41942 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -42702,16 +41954,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41957: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42708: \$? = $ac_status" >&5
+  echo "$as_me:41960: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42714: \$? = $ac_status" >&5
+  echo "$as_me:41966: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -42722,7 +41974,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:42725: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:41977: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -42737,23 +41989,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:42740: checking for xcurses.h" >&5
+	echo "$as_me:41992: checking for xcurses.h" >&5
 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
 if test "${ac_cv_header_xcurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 42746 "configure"
+#line 41998 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:42750: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42002: \"$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:42756: \$? = $ac_status" >&5
+  echo "$as_me:42008: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42772,7 +42024,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:42775: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:42027: result: $ac_cv_header_xcurses_h" >&5
 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
 if test $ac_cv_header_xcurses_h = yes; then
 
@@ -42783,7 +42035,7 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:42786: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:42038: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -42792,7 +42044,7 @@ fi
 	esac
 else
 
-echo "$as_me:42795: checking if we can include termio.h with curses" >&5
+echo "$as_me:42047: 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
@@ -42802,7 +42054,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 42805 "configure"
+#line 42057 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -42816,16 +42068,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42819: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42071: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42822: \$? = $ac_status" >&5
+  echo "$as_me:42074: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42825: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42828: \$? = $ac_status" >&5
+  echo "$as_me:42080: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -42838,7 +42090,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:42841: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:42093: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test $cf_cv_termio_and_curses = yes &&
@@ -42855,23 +42107,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:42858: checking for $ac_header" >&5
+echo "$as_me:42110: 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 42864 "configure"
+#line 42116 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:42868: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42120: \"$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:42874: \$? = $ac_status" >&5
+  echo "$as_me:42126: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42890,7 +42142,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:42893: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:42145: 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
@@ -42902,7 +42154,7 @@ done
 
 	fi
 
-echo "$as_me:42905: checking if curses supports alternate-character set" >&5
+echo "$as_me:42157: 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
@@ -42911,7 +42163,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 42914 "configure"
+#line 42166 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42925,16 +42177,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42928: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42931: \$? = $ac_status" >&5
+  echo "$as_me:42183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42937: \$? = $ac_status" >&5
+  echo "$as_me:42189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -42948,21 +42200,21 @@ done
 
 fi
 
-echo "$as_me:42951: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:42203: 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:42958: checking if curses supports fancy attributes" >&5
+echo "$as_me:42210: 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 42965 "configure"
+#line 42217 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42980,16 +42232,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42983: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42235: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42986: \$? = $ac_status" >&5
+  echo "$as_me:42238: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42992: \$? = $ac_status" >&5
+  echo "$as_me:42244: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -43001,14 +42253,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:43004: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:42256: 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:43011: checking for function curses_version" >&5
+echo "$as_me:42263: 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
@@ -43018,7 +42270,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 43021 "configure"
+#line 42273 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43031,15 +42283,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:43034: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42286: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43037: \$? = $ac_status" >&5
+  echo "$as_me:42289: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:43039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42291: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43042: \$? = $ac_status" >&5
+  echo "$as_me:42294: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -43054,7 +42306,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:43057: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:42309: 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
@@ -43062,14 +42314,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:43065: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:42317: 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 43072 "configure"
+#line 42324 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43088,16 +42340,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43091: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42343: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43094: \$? = $ac_status" >&5
+  echo "$as_me:42346: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42349: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43100: \$? = $ac_status" >&5
+  echo "$as_me:42352: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -43109,10 +42361,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:43112: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:42364: 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:43115: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:42367: 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
@@ -43122,14 +42374,14 @@ EOF
 fi
 fi
 
-echo "$as_me:43125: checking if curses supports color attributes" >&5
+echo "$as_me:42377: 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 43132 "configure"
+#line 42384 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43149,16 +42401,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43152: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42404: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43155: \$? = $ac_status" >&5
+  echo "$as_me:42407: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43158: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42410: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43161: \$? = $ac_status" >&5
+  echo "$as_me:42413: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -43170,7 +42422,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:43173: result: $cf_cv_color_curses" >&5
+echo "$as_me:42425: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test $cf_cv_color_curses = yes ; then
 
@@ -43192,23 +42444,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:43195: checking for $ac_header" >&5
+echo "$as_me:42447: 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 43201 "configure"
+#line 42453 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:43205: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42457: \"$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:43211: \$? = $ac_status" >&5
+  echo "$as_me:42463: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -43227,7 +42479,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:43230: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:42482: 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
@@ -43242,23 +42494,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:43245: checking for $ac_header" >&5
+echo "$as_me:42497: 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 43251 "configure"
+#line 42503 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:43255: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42507: \"$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:43261: \$? = $ac_status" >&5
+  echo "$as_me:42513: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -43277,7 +42529,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:43280: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:42532: 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
@@ -43295,10 +42547,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:43298: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:42550: 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 43301 "configure"
+#line 42553 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -43310,16 +42562,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43313: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42565: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43316: \$? = $ac_status" >&5
+  echo "$as_me:42568: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42571: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43322: \$? = $ac_status" >&5
+  echo "$as_me:42574: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -43327,7 +42579,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 43330 "configure"
+#line 42582 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -43341,16 +42593,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43344: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42596: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43347: \$? = $ac_status" >&5
+  echo "$as_me:42599: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42602: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43353: \$? = $ac_status" >&5
+  echo "$as_me:42605: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -43366,12 +42618,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:43369: result: $termios_bad" >&5
+	echo "$as_me:42621: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:43374: checking declaration of size-change" >&5
+echo "$as_me:42626: 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
@@ -43386,7 +42638,7 @@ do
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 43389 "configure"
+#line 42641 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -43430,16 +42682,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43433: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42685: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43436: \$? = $ac_status" >&5
+  echo "$as_me:42688: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43442: \$? = $ac_status" >&5
+  echo "$as_me:42694: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -43458,7 +42710,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:43461: result: $cf_cv_sizechange" >&5
+echo "$as_me:42713: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -43476,14 +42728,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:43479: checking if ttytype is declared in curses library" >&5
+echo "$as_me:42731: 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 43486 "configure"
+#line 42738 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -43495,16 +42747,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43498: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42750: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43501: \$? = $ac_status" >&5
+  echo "$as_me:42753: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43507: \$? = $ac_status" >&5
+  echo "$as_me:42759: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -43516,7 +42768,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:43519: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:42771: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test $cf_cv_have_ttytype = yes &&
 cat >>confdefs.h <<\EOF
@@ -43525,14 +42777,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:43528: checking if curses supports wide characters" >&5
+echo "$as_me:42780: 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 43535 "configure"
+#line 42787 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -43551,16 +42803,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42806: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43557: \$? = $ac_status" >&5
+  echo "$as_me:42809: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43563: \$? = $ac_status" >&5
+  echo "$as_me:42815: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -43571,7 +42823,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:43574: result: $cf_cv_widec_curses" >&5
+echo "$as_me:42826: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -43581,14 +42833,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:43584: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:42836: 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 43591 "configure"
+#line 42843 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -43602,23 +42854,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43605: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42857: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43608: \$? = $ac_status" >&5
+  echo "$as_me:42860: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43614: \$? = $ac_status" >&5
+  echo "$as_me:42866: \$? = $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 43621 "configure"
+#line 42873 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -43633,16 +42885,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43636: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42888: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43639: \$? = $ac_status" >&5
+  echo "$as_me:42891: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43642: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42894: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43645: \$? = $ac_status" >&5
+  echo "$as_me:42897: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -43654,7 +42906,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:43657: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:42909: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -43677,14 +42929,14 @@ fi
 
 	fi
 
-echo "$as_me:43680: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:42932: 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 43687 "configure"
+#line 42939 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -43706,23 +42958,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43709: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42961: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43712: \$? = $ac_status" >&5
+  echo "$as_me:42964: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43718: \$? = $ac_status" >&5
+  echo "$as_me:42970: \$? = $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 43725 "configure"
+#line 42977 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -43744,16 +42996,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43747: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42999: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43750: \$? = $ac_status" >&5
+  echo "$as_me:43002: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43756: \$? = $ac_status" >&5
+  echo "$as_me:43008: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -43765,11 +43017,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:43768: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:43020: 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:43772: checking for term.h" >&5
+echo "$as_me:43024: 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
@@ -43790,7 +43042,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43793 "configure"
+#line 43045 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43804,16 +43056,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43807: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43059: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43810: \$? = $ac_status" >&5
+  echo "$as_me:43062: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43065: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43816: \$? = $ac_status" >&5
+  echo "$as_me:43068: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -43832,7 +43084,7 @@ no)
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 43835 "configure"
+#line 43087 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43850,16 +43102,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43853: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43856: \$? = $ac_status" >&5
+  echo "$as_me:43108: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43859: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43862: \$? = $ac_status" >&5
+  echo "$as_me:43114: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -43874,7 +43126,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 esac
 
 fi
-echo "$as_me:43877: result: $cf_cv_term_header" >&5
+echo "$as_me:43129: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -43901,7 +43153,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:43904: checking for unctrl.h" >&5
+echo "$as_me:43156: checking for unctrl.h" >&5
 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
 if test "${cf_cv_unctrl_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43922,7 +43174,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43925 "configure"
+#line 43177 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43936,16 +43188,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43939: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43191: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43942: \$? = $ac_status" >&5
+  echo "$as_me:43194: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43197: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43948: \$? = $ac_status" >&5
+  echo "$as_me:43200: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -43958,12 +43210,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:43961: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:43213: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case $cf_cv_unctrl_header in #(vi
 no)
-	{ echo "$as_me:43966: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:43218: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -44019,10 +43271,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:44022: checking for ${cf_func}" >&5
+	echo "$as_me:43274: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:44025: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:43277: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -44031,7 +43283,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 44034 "configure"
+#line 43286 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -44064,16 +43316,16 @@ if (foo + 1234 > 5678)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44067: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44070: \$? = $ac_status" >&5
+  echo "$as_me:43322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44076: \$? = $ac_status" >&5
+  echo "$as_me:43328: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -44089,7 +43341,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:44092: result: $cf_result" >&5
+	echo "$as_me:43344: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -44105,13 +43357,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:44108: checking for $ac_func" >&5
+echo "$as_me:43360: 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 44114 "configure"
+#line 43366 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -44142,16 +43394,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43397: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44148: \$? = $ac_status" >&5
+  echo "$as_me:43400: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43403: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44154: \$? = $ac_status" >&5
+  echo "$as_me:43406: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -44161,7 +43413,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:44164: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:43416: 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
@@ -44175,12 +43427,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:44178: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:43430: 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:44183: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:43435: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -44188,7 +43440,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:44191: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:43443: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 
@@ -44202,7 +43454,7 @@ fi
 # use rpath for libraries in unusual places
 
 LD_RPATH_OPT=
-echo "$as_me:44205: checking for an rpath option" >&5
+echo "$as_me:43457: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 case $cf_cv_system_name in #(vi
 irix*) #(vi
@@ -44233,12 +43485,12 @@ solaris2*) #(vi
 *)
 	;;
 esac
-echo "$as_me:44236: result: $LD_RPATH_OPT" >&5
+echo "$as_me:43488: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 case "x$LD_RPATH_OPT" in #(vi
 x-R*)
-	echo "$as_me:44241: checking if we need a space after rpath option" >&5
+	echo "$as_me:43493: checking if we need a space after rpath option" >&5
 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
 	cf_save_LIBS="$LIBS"
 
@@ -44259,7 +43511,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 44262 "configure"
+#line 43514 "configure"
 #include "confdefs.h"
 
 int
@@ -44271,16 +43523,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43526: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44277: \$? = $ac_status" >&5
+  echo "$as_me:43529: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44283: \$? = $ac_status" >&5
+  echo "$as_me:43535: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
@@ -44290,13 +43542,13 @@ cf_rpath_space=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	LIBS="$cf_save_LIBS"
-	echo "$as_me:44293: result: $cf_rpath_space" >&5
+	echo "$as_me:43545: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 	;;
 esac
 
-echo "$as_me:44299: checking if rpath-hack should be disabled" >&5
+echo "$as_me:43551: checking if rpath-hack should be disabled" >&5
 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
 
 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
@@ -44313,21 +43565,21 @@ else
   cf_disable_rpath_hack=no
 
 fi;
-echo "$as_me:44316: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:43568: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 if test "$cf_disable_rpath_hack" = no ; then
 
-echo "$as_me:44320: checking for updated LDFLAGS" >&5
+echo "$as_me:43572: checking for updated LDFLAGS" >&5
 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
 if test -n "$LD_RPATH_OPT" ; then
-	echo "$as_me:44323: result: maybe" >&5
+	echo "$as_me:43575: result: maybe" >&5
 echo "${ECHO_T}maybe" >&6
 
 	for ac_prog in ldd
 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:44330: checking for $ac_word" >&5
+echo "$as_me:43582: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -44342,7 +43594,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_cf_ldd_prog="$ac_prog"
-echo "$as_me:44345: found $ac_dir/$ac_word" >&5
+echo "$as_me:43597: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -44350,10 +43602,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:44353: result: $cf_ldd_prog" >&5
+  echo "$as_me:43605: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:44356: result: no" >&5
+  echo "$as_me:43608: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44367,7 +43619,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 44370 "configure"
+#line 43622 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -44379,16 +43631,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44382: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43634: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44385: \$? = $ac_status" >&5
+  echo "$as_me:43637: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44391: \$? = $ac_status" >&5
+  echo "$as_me:43643: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -44416,7 +43668,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:44419: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:43671: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -44428,11 +43680,11 @@ echo "${as_me:-configure}:44419: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:44431: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43683: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:44435: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43687: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -44469,7 +43721,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:44472: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:43724: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -44482,11 +43734,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:44485: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43737: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:44489: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:43741: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -44523,7 +43775,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:44526: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:43778: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -44536,14 +43788,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:44539: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:43791: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:44543: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43795: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:44546: result: no" >&5
+	echo "$as_me:43798: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44644,7 +43896,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:44647: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:43899: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -44776,7 +44028,7 @@ EOF
 cat >>$CONFIG_STATUS <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20121002,
+configured by $0, generated by GNU Autoconf 2.52.20141204,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -44820,7 +44072,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:44823: error: ambiguous option: $1
+    { { echo "$as_me:44075: 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;}
@@ -44839,7 +44091,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:44842: error: unrecognized option: $1
+  -*) { { echo "$as_me:44094: 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;}
@@ -44858,7 +44110,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20121002, executed with
+This file was extended by $as_me 2.52.20141204, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -44892,7 +44144,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:44895: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:44147: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -45226,7 +44478,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:45229: creating $ac_file" >&5
+    { echo "$as_me:44481: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -45244,7 +44496,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:45247: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:44499: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -45257,7 +44509,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:45260: error: cannot find input file: $f" >&5
+           { { echo "$as_me:44512: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -45273,7 +44525,7 @@ cat >>$CONFIG_STATUS <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' $ac_item`
         if test -z "$ac_used"; then
-          { echo "$as_me:45276: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:44528: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
@@ -45282,7 +44534,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' $ac_item`
       if test -n "$ac_seen"; then
-        { echo "$as_me:45285: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:44537: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}
@@ -45319,7 +44571,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
-              { echo "$as_me:45322: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:44574: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
@@ -45330,7 +44582,7 @@ $ac_seen" >&2;}
     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
-      { echo "$as_me:45333: WARNING: Some variables may not be substituted:
+      { echo "$as_me:44585: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -45379,7 +44631,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:45382: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:44634: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -45390,7 +44642,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:45393: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:44645: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -45403,7 +44655,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:45406: error: cannot find input file: $f" >&5
+           { { echo "$as_me:44658: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -45521,7 +44773,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:45524: $ac_file is unchanged" >&5
+      { echo "$as_me:44776: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \