snapshot of project "lynx", label v2-8-9dev_5d

1 files changed, 4102 insertions, 3866 deletions

diff --git a/configure b/configure
index 5da6b2ab..0b541269 100755
--- a/configure
+++ b/configure
@@ -1288,34 +1288,34 @@ else
 fi; if test -n "$DESTDIR" ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$withval" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval withval="$withval"
-  case ".$withval" in
-  (.NONE/*)
-    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval withval="$withval"
+	case ".$withval" in
+	(.NONE/*)
+		withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  { { echo "$as_me:1315: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:1315: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
-  ;;
+	;;
 esac
 
 fi
@@ -3296,29 +3296,29 @@ if test "${enable_echo+set}" = set; then
   test "$enableval" != no && enableval=yes
   if test "$enableval" != "yes" ; then
 
-    ECHO_LT='--silent'
-    ECHO_LD='@echo linking $@;'
-    RULE_CC='@echo compiling $<'
-    SHOW_CC='@echo compiling $@'
-    ECHO_CC='@'
+	ECHO_LT='--silent'
+	ECHO_LD='@echo linking $@;'
+	RULE_CC='@echo compiling $<'
+	SHOW_CC='@echo compiling $@'
+	ECHO_CC='@'
 
   else
 
-    ECHO_LT=''
-    ECHO_LD=''
-    RULE_CC=''
-    SHOW_CC=''
-    ECHO_CC=''
+	ECHO_LT=''
+	ECHO_LD=''
+	RULE_CC=''
+	SHOW_CC=''
+	ECHO_CC=''
 
   fi
 else
   enableval=yes
 
-    ECHO_LT=''
-    ECHO_LD=''
-    RULE_CC=''
-    SHOW_CC=''
-    ECHO_CC=''
+	ECHO_LT=''
+	ECHO_LD=''
+	RULE_CC=''
+	SHOW_CC=''
+	ECHO_CC=''
 
 fi;
 echo "$as_me:3324: result: $enableval" >&5
@@ -5295,7 +5295,7 @@ fi
 rm -rf conftest*
 fi
 
-    if test "$enable_largefile" != no ; then
+	if test "$enable_largefile" != no ; then
 	echo "$as_me:5299: checking for _LARGEFILE_SOURCE value needed for large files" >&5
 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_source+set}" = set; then
@@ -5494,7 +5494,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_STRUCT_DIRENT64 1
 EOF
 
-    fi
+	fi
 
 if test -z "$ALL_LINGUAS" ; then
 	ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
@@ -6891,59 +6891,59 @@ echo "$as_me: error: cannot find libiconv under $withval" >&2;}
 	if test -d $cf_searchpath/lib; then
 
 if test -n "$cf_searchpath/lib" ; then
-  for cf_add_libdir in $cf_searchpath/lib
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath/lib
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:6912: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	elif test -d $cf_searchpath ; then
 
 if test -n "$cf_searchpath" ; then
-  for cf_add_libdir in $cf_searchpath
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:6941: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	else
@@ -7059,14 +7059,14 @@ cat conftest.$ac_ext >&5
 	cf_cv_find_linkage_iconv=no
 	LIBS="$cf_save_LIBS"
 
-    test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
+	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
 echo "${as_me:-configure}:7064: testing find linkage for iconv library ..." 1>&5
 
 echo "${as_me:-configure}:7066: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
-    cf_save_CPPFLAGS="$CPPFLAGS"
-    cf_test_CPPFLAGS="$CPPFLAGS"
+	cf_save_CPPFLAGS="$CPPFLAGS"
+	cf_test_CPPFLAGS="$CPPFLAGS"
 
 cf_search=
 
@@ -7149,15 +7149,15 @@ test -d "$oldincludedir" && {
 
 cf_search="$cf_search $cf_header_path_list"
 
-    for cf_cv_header_path_iconv in $cf_search
-    do
-      if test -d $cf_cv_header_path_iconv ; then
-        test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
+	for cf_cv_header_path_iconv in $cf_search
+	do
+		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}: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
+			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
+			cat >conftest.$ac_ext <<_ACEOF
 #line 7161 "configure"
 #include "confdefs.h"
 
@@ -7189,32 +7189,32 @@ if { (eval echo "$as_me:7180: \"$ac_compile\"") >&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
+				test -n "$verbose" && echo "	... found iconv headers in $cf_cv_header_path_iconv" 1>&6
 
 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"
-            break
+				cf_cv_find_linkage_iconv=maybe
+				cf_test_CPPFLAGS="$CPPFLAGS"
+				break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-            CPPFLAGS="$cf_save_CPPFLAGS"
+				CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-      fi
-    done
+		fi
+	done
 
-    if test "$cf_cv_find_linkage_iconv" = maybe ; then
+	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
 echo "${as_me:-configure}:7212: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
-      cf_save_LIBS="$LIBS"
-      cf_save_LDFLAGS="$LDFLAGS"
+		cf_save_LIBS="$LIBS"
+		cf_save_LDFLAGS="$LDFLAGS"
 
-      if test "$cf_cv_find_linkage_iconv" != yes ; then
+		if test "$cf_cv_find_linkage_iconv" != yes ; then
 
 cf_search=
 cf_library_path_list=""
@@ -7279,17 +7279,17 @@ done
 
 cf_search="$cf_library_path_list $cf_search"
 
-        for cf_cv_library_path_iconv in $cf_search
-        do
-          if test -d $cf_cv_library_path_iconv ; then
-            test -n "$verbose" && echo "	... testing $cf_cv_library_path_iconv" 1>&6
+			for cf_cv_library_path_iconv in $cf_search
+			do
+				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}: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
+					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 7293 "configure"
 #include "confdefs.h"
 
@@ -7321,32 +7321,32 @@ if { (eval echo "$as_me:7312: \"$ac_link\"") >&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
+					test -n "$verbose" && echo "	... found iconv library in $cf_cv_library_path_iconv" 1>&6
 
 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"
-                break
+					cf_cv_find_linkage_iconv=yes
+					cf_cv_library_file_iconv="-liconv"
+					break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-                CPPFLAGS="$cf_save_CPPFLAGS"
-                LIBS="$cf_save_LIBS"
-                LDFLAGS="$cf_save_LDFLAGS"
+					CPPFLAGS="$cf_save_CPPFLAGS"
+					LIBS="$cf_save_LIBS"
+					LDFLAGS="$cf_save_LDFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-          fi
-        done
-        CPPFLAGS="$cf_save_CPPFLAGS"
-        LDFLAGS="$cf_save_LDFLAGS"
-      fi
+				fi
+			done
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			LDFLAGS="$cf_save_LDFLAGS"
+		fi
 
-    else
-      cf_cv_find_linkage_iconv=no
-    fi
+	else
+		cf_cv_find_linkage_iconv=no
+	fi
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
@@ -7522,36 +7522,36 @@ fi
       LIBICONV="-liconv"
 
 if test -n "$cf_cv_library_path_iconv" ; then
-  for cf_add_libdir in $cf_cv_library_path_iconv
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_cv_library_path_iconv
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:7543: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
     fi
   fi
 
-  echo "$as_me:7554: 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
@@ -7591,13 +7591,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 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
+	if test $am_cv_langinfo_codeset = yes; then
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LANGINFO_CODESET 1
 EOF
 
-  fi
+	fi
 
    if test $ac_cv_header_locale_h = yes; then
     echo "$as_me:7603: checking for LC_MESSAGES" >&5
@@ -7808,14 +7808,14 @@ cat conftest.$ac_ext >&5
 	cf_cv_find_linkage_intl=no
 	LIBS="$cf_save_LIBS"
 
-    test -n "$verbose" && echo "	find linkage for intl library" 1>&6
+	test -n "$verbose" && echo "	find linkage for intl library" 1>&6
 
 echo "${as_me:-configure}:7813: testing find linkage for intl library ..." 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"
+	cf_save_CPPFLAGS="$CPPFLAGS"
+	cf_test_CPPFLAGS="$CPPFLAGS"
 
 cf_search=
 
@@ -7898,15 +7898,15 @@ test -d "$oldincludedir" && {
 
 cf_search="$cf_search $cf_header_path_list"
 
-    for cf_cv_header_path_intl in $cf_search
-    do
-      if test -d $cf_cv_header_path_intl ; then
-        test -n "$verbose" && echo "	... testing $cf_cv_header_path_intl" 1>&6
+	for cf_cv_header_path_intl in $cf_search
+	do
+		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}: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
+			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl"
+			cat >conftest.$ac_ext <<_ACEOF
 #line 7910 "configure"
 #include "confdefs.h"
 
@@ -7939,32 +7939,32 @@ if { (eval echo "$as_me:7930: \"$ac_compile\"") >&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
+				test -n "$verbose" && echo "	... found intl headers in $cf_cv_header_path_intl" 1>&6
 
 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"
-            break
+				cf_cv_find_linkage_intl=maybe
+				cf_test_CPPFLAGS="$CPPFLAGS"
+				break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-            CPPFLAGS="$cf_save_CPPFLAGS"
+				CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-      fi
-    done
+		fi
+	done
 
-    if test "$cf_cv_find_linkage_intl" = maybe ; then
+	if test "$cf_cv_find_linkage_intl" = maybe ; then
 
 echo "${as_me:-configure}:7962: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
-      cf_save_LIBS="$LIBS"
-      cf_save_LDFLAGS="$LDFLAGS"
+		cf_save_LIBS="$LIBS"
+		cf_save_LDFLAGS="$LDFLAGS"
 
-      if test "$cf_cv_find_linkage_intl" != yes ; then
+		if test "$cf_cv_find_linkage_intl" != yes ; then
 
 cf_search=
 cf_library_path_list=""
@@ -8029,17 +8029,17 @@ done
 
 cf_search="$cf_library_path_list $cf_search"
 
-        for cf_cv_library_path_intl in $cf_search
-        do
-          if test -d $cf_cv_library_path_intl ; then
-            test -n "$verbose" && echo "	... testing $cf_cv_library_path_intl" 1>&6
+			for cf_cv_library_path_intl in $cf_search
+			do
+				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}: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
+					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 8043 "configure"
 #include "confdefs.h"
 
@@ -8072,32 +8072,32 @@ if { (eval echo "$as_me:8063: \"$ac_link\"") >&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
+					test -n "$verbose" && echo "	... found intl library in $cf_cv_library_path_intl" 1>&6
 
 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"
-                break
+					cf_cv_find_linkage_intl=yes
+					cf_cv_library_file_intl="-lintl"
+					break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-                CPPFLAGS="$cf_save_CPPFLAGS"
-                LIBS="$cf_save_LIBS"
-                LDFLAGS="$cf_save_LDFLAGS"
+					CPPFLAGS="$cf_save_CPPFLAGS"
+					LIBS="$cf_save_LIBS"
+					LDFLAGS="$cf_save_LDFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-          fi
-        done
-        CPPFLAGS="$cf_save_CPPFLAGS"
-        LDFLAGS="$cf_save_LDFLAGS"
-      fi
+				fi
+			done
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			LDFLAGS="$cf_save_LDFLAGS"
+		fi
 
-    else
-      cf_cv_find_linkage_intl=no
-    fi
+	else
+		cf_cv_find_linkage_intl=no
+	fi
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
@@ -8211,30 +8211,30 @@ fi
                                                 INTLLIBS="$cf_cv_library_file_intl $LIBICONV"
 
 if test -n "$cf_cv_library_path_intl" ; then
-  for cf_add_libdir in $cf_cv_library_path_intl
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_cv_library_path_intl
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:8232: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        INTLLIBS="-L$cf_add_libdir $INTLLIBS"
-      fi
-    fi
-  done
+				INTLLIBS="-L$cf_add_libdir $INTLLIBS"
+			fi
+		fi
+	done
 fi
 
           fi
@@ -8871,34 +8871,34 @@ else
 fi; if test -n "$prefix/$DATADIRNAME" ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$withval" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval withval="$withval"
-  case ".$withval" in
-  (.NONE/*)
-    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval withval="$withval"
+	case ".$withval" in
+	(.NONE/*)
+		withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  { { echo "$as_me:8898: 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; }; }
-  ;;
+	;;
 esac
 
 fi
@@ -10737,59 +10737,59 @@ echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;}
 	if test -d $cf_searchpath/lib; then
 
 if test -n "$cf_searchpath/lib" ; then
-  for cf_add_libdir in $cf_searchpath/lib
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath/lib
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:10758: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	elif test -d $cf_searchpath ; then
 
 if test -n "$cf_searchpath" ; then
-  for cf_add_libdir in $cf_searchpath
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:10787: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	else
@@ -10891,14 +10891,14 @@ cat conftest.$ac_ext >&5
 	cf_cv_find_linkage_socks=no
 	LIBS="$cf_save_LIBS"
 
-    test -n "$verbose" && echo "	find linkage for socks library" 1>&6
+	test -n "$verbose" && echo "	find linkage for socks library" 1>&6
 
 echo "${as_me:-configure}:10896: testing find linkage for socks library ..." 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"
+	cf_save_CPPFLAGS="$CPPFLAGS"
+	cf_test_CPPFLAGS="$CPPFLAGS"
 
 cf_search=
 
@@ -10981,15 +10981,15 @@ test -d "$oldincludedir" && {
 
 cf_search="$cf_search $cf_header_path_list"
 
-    for cf_cv_header_path_socks in $cf_search
-    do
-      if test -d $cf_cv_header_path_socks ; then
-        test -n "$verbose" && echo "	... testing $cf_cv_header_path_socks" 1>&6
+	for cf_cv_header_path_socks in $cf_search
+	do
+		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}: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
+			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_socks"
+			cat >conftest.$ac_ext <<_ACEOF
 #line 10993 "configure"
 #include "confdefs.h"
 
@@ -11018,32 +11018,32 @@ if { (eval echo "$as_me:11009: \"$ac_compile\"") >&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
+				test -n "$verbose" && echo "	... found socks headers in $cf_cv_header_path_socks" 1>&6
 
 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"
-            break
+				cf_cv_find_linkage_socks=maybe
+				cf_test_CPPFLAGS="$CPPFLAGS"
+				break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-            CPPFLAGS="$cf_save_CPPFLAGS"
+				CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-      fi
-    done
+		fi
+	done
 
-    if test "$cf_cv_find_linkage_socks" = maybe ; then
+	if test "$cf_cv_find_linkage_socks" = maybe ; then
 
 echo "${as_me:-configure}:11041: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
 
-      cf_save_LIBS="$LIBS"
-      cf_save_LDFLAGS="$LDFLAGS"
+		cf_save_LIBS="$LIBS"
+		cf_save_LDFLAGS="$LDFLAGS"
 
-      if test "$cf_cv_find_linkage_socks" != yes ; then
+		if test "$cf_cv_find_linkage_socks" != yes ; then
 
 cf_search=
 cf_library_path_list=""
@@ -11108,17 +11108,17 @@ done
 
 cf_search="$cf_library_path_list $cf_search"
 
-        for cf_cv_library_path_socks in $cf_search
-        do
-          if test -d $cf_cv_library_path_socks ; then
-            test -n "$verbose" && echo "	... testing $cf_cv_library_path_socks" 1>&6
+			for cf_cv_library_path_socks in $cf_search
+			do
+				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}: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
+					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 11122 "configure"
 #include "confdefs.h"
 
@@ -11147,32 +11147,32 @@ if { (eval echo "$as_me:11138: \"$ac_link\"") >&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
+					test -n "$verbose" && echo "	... found socks library in $cf_cv_library_path_socks" 1>&6
 
 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"
-                break
+					cf_cv_find_linkage_socks=yes
+					cf_cv_library_file_socks="-lsocks"
+					break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-                CPPFLAGS="$cf_save_CPPFLAGS"
-                LIBS="$cf_save_LIBS"
-                LDFLAGS="$cf_save_LDFLAGS"
+					CPPFLAGS="$cf_save_CPPFLAGS"
+					LIBS="$cf_save_LIBS"
+					LDFLAGS="$cf_save_LDFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-          fi
-        done
-        CPPFLAGS="$cf_save_CPPFLAGS"
-        LDFLAGS="$cf_save_LDFLAGS"
-      fi
+				fi
+			done
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			LDFLAGS="$cf_save_LDFLAGS"
+		fi
 
-    else
-      cf_cv_find_linkage_socks=no
-    fi
+	else
+		cf_cv_find_linkage_socks=no
+	fi
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
@@ -11262,30 +11262,30 @@ echo "${as_me:-configure}:11249: testing adding $cf_add_incdir to include-path .
 fi
 
 if test -n "$cf_cv_library_path_socks" ; then
-  for cf_add_libdir in $cf_cv_library_path_socks
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_cv_library_path_socks
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:11283: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 cf_add_libs="-lsocks"
@@ -11529,59 +11529,59 @@ echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;
 	if test -d $cf_searchpath/lib; then
 
 if test -n "$cf_searchpath/lib" ; then
-  for cf_add_libdir in $cf_searchpath/lib
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath/lib
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:11550: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	elif test -d $cf_searchpath ; then
 
 if test -n "$cf_searchpath" ; then
-  for cf_add_libdir in $cf_searchpath
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:11579: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	else
@@ -13298,34 +13298,34 @@ test -z "$PKG_CONFIG" && PKG_CONFIG=none
 if test "$PKG_CONFIG" != none ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$PKG_CONFIG" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval PKG_CONFIG="$PKG_CONFIG"
-  case ".$PKG_CONFIG" in
-  (.NONE/*)
-    PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval PKG_CONFIG="$PKG_CONFIG"
+	case ".$PKG_CONFIG" in
+	(.NONE/*)
+		PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  { { echo "$as_me:13325: 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; }; }
-  ;;
+	;;
 esac
 
 else
@@ -13514,59 +13514,59 @@ echo "$as_me: error: cannot find ssl library under $cf_cv_use_libssl" >&2;}
 	if test -d $cf_searchpath/lib; then
 
 if test -n "$cf_searchpath/lib" ; then
-  for cf_add_libdir in $cf_searchpath/lib
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath/lib
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:13535: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	elif test -d $cf_searchpath ; then
 
 if test -n "$cf_searchpath" ; then
-  for cf_add_libdir in $cf_searchpath
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:13564: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	else
@@ -13928,14 +13928,14 @@ cat conftest.$ac_ext >&5
 	cf_cv_find_linkage_ssl=no
 	LIBS="$cf_save_LIBS"
 
-    test -n "$verbose" && echo "	find linkage for ssl library" 1>&6
+	test -n "$verbose" && echo "	find linkage for ssl library" 1>&6
 
 echo "${as_me:-configure}:13933: testing find linkage for ssl library ..." 1>&5
 
 echo "${as_me:-configure}:13935: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
-    cf_save_CPPFLAGS="$CPPFLAGS"
-    cf_test_CPPFLAGS="$CPPFLAGS"
+	cf_save_CPPFLAGS="$CPPFLAGS"
+	cf_test_CPPFLAGS="$CPPFLAGS"
 
 cf_search=
 
@@ -14018,15 +14018,15 @@ test -d "$oldincludedir" && {
 
 cf_search="$cf_search $cf_header_path_list"
 
-    for cf_cv_header_path_ssl in $cf_search
-    do
-      if test -d $cf_cv_header_path_ssl ; then
-        test -n "$verbose" && echo "	... testing $cf_cv_header_path_ssl" 1>&6
+	for cf_cv_header_path_ssl in $cf_search
+	do
+		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}:14026: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
 
-        CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_ssl"
-        cat >conftest.$ac_ext <<_ACEOF
+			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_ssl"
+			cat >conftest.$ac_ext <<_ACEOF
 #line 14030 "configure"
 #include "confdefs.h"
 
@@ -14068,34 +14068,34 @@ if { (eval echo "$as_me:14059: \"$ac_compile\"") >&5
   echo "$as_me:14068: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-            test -n "$verbose" && echo "	... found ssl headers in $cf_cv_header_path_ssl" 1>&6
+				test -n "$verbose" && echo "	... found ssl headers in $cf_cv_header_path_ssl" 1>&6
 
 echo "${as_me:-configure}:14073: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
-            cf_cv_find_linkage_ssl=maybe
-            cf_test_CPPFLAGS="$CPPFLAGS"
-            break
+				cf_cv_find_linkage_ssl=maybe
+				cf_test_CPPFLAGS="$CPPFLAGS"
+				break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-            CPPFLAGS="$cf_save_CPPFLAGS"
+				CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-      fi
-    done
+		fi
+	done
 
-    if test "$cf_cv_find_linkage_ssl" = maybe ; then
+	if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
 echo "${as_me:-configure}:14091: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
-      cf_save_LIBS="$LIBS"
-      cf_save_LDFLAGS="$LDFLAGS"
+		cf_save_LIBS="$LIBS"
+		cf_save_LDFLAGS="$LDFLAGS"
 
-        CPPFLAGS="$cf_test_CPPFLAGS"
-        LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
-        cat >conftest.$ac_ext <<_ACEOF
+		CPPFLAGS="$cf_test_CPPFLAGS"
+		LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
+		cat >conftest.$ac_ext <<_ACEOF
 #line 14099 "configure"
 #include "confdefs.h"
 
@@ -14137,20 +14137,20 @@ if { (eval echo "$as_me:14128: \"$ac_link\"") >&5
   echo "$as_me:14137: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-            test -n "$verbose" && echo "	... found ssl library in system" 1>&6
+			test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
 echo "${as_me:-configure}:14142: testing ... found ssl library in system ..." 1>&5
 
-            cf_cv_find_linkage_ssl=yes
+			cf_cv_find_linkage_ssl=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-            CPPFLAGS="$cf_save_CPPFLAGS"
-            LIBS="$cf_save_LIBS"
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			LIBS="$cf_save_LIBS"
 
-      if test "$cf_cv_find_linkage_ssl" != yes ; then
+		if test "$cf_cv_find_linkage_ssl" != yes ; then
 
 cf_search=
 cf_library_path_list=""
@@ -14215,17 +14215,17 @@ done
 
 cf_search="$cf_library_path_list $cf_search"
 
-        for cf_cv_library_path_ssl in $cf_search
-        do
-          if test -d $cf_cv_library_path_ssl ; then
-            test -n "$verbose" && echo "	... testing $cf_cv_library_path_ssl" 1>&6
+			for cf_cv_library_path_ssl in $cf_search
+			do
+				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}:14223: 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
+					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 14229 "configure"
 #include "confdefs.h"
 
@@ -14267,32 +14267,32 @@ if { (eval echo "$as_me:14258: \"$ac_link\"") >&5
   echo "$as_me:14267: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-                test -n "$verbose" && echo "	... found ssl library in $cf_cv_library_path_ssl" 1>&6
+					test -n "$verbose" && echo "	... found ssl library in $cf_cv_library_path_ssl" 1>&6
 
 echo "${as_me:-configure}:14272: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
-                cf_cv_find_linkage_ssl=yes
-                cf_cv_library_file_ssl="-lssl"
-                break
+					cf_cv_find_linkage_ssl=yes
+					cf_cv_library_file_ssl="-lssl"
+					break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-                CPPFLAGS="$cf_save_CPPFLAGS"
-                LIBS="$cf_save_LIBS"
-                LDFLAGS="$cf_save_LDFLAGS"
+					CPPFLAGS="$cf_save_CPPFLAGS"
+					LIBS="$cf_save_LIBS"
+					LDFLAGS="$cf_save_LDFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-          fi
-        done
-        CPPFLAGS="$cf_save_CPPFLAGS"
-        LDFLAGS="$cf_save_LDFLAGS"
-      fi
+				fi
+			done
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			LDFLAGS="$cf_save_LDFLAGS"
+		fi
 
-    else
-      cf_cv_find_linkage_ssl=no
-    fi
+	else
+		cf_cv_find_linkage_ssl=no
+	fi
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
@@ -14313,30 +14313,30 @@ fi
 				if test -n "$cf_cv_library_path_ssl" ; then
 
 if test -n "$cf_cv_library_path_ssl" ; then
-  for cf_add_libdir in $cf_cv_library_path_ssl
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_cv_library_path_ssl
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:14334: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 				fi
@@ -14711,59 +14711,59 @@ echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
 	if test -d $cf_searchpath/lib; then
 
 if test -n "$cf_searchpath/lib" ; then
-  for cf_add_libdir in $cf_searchpath/lib
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath/lib
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:14732: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	elif test -d $cf_searchpath ; then
 
 if test -n "$cf_searchpath" ; then
-  for cf_add_libdir in $cf_searchpath
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:14761: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	else
@@ -15054,14 +15054,14 @@ cat conftest.$ac_ext >&5
 	cf_cv_find_linkage_gnutls=no
 	LIBS="$cf_save_LIBS"
 
-    test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
+	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
 echo "${as_me:-configure}:15059: testing find linkage for gnutls library ..." 1>&5
 
 echo "${as_me:-configure}:15061: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
-    cf_save_CPPFLAGS="$CPPFLAGS"
-    cf_test_CPPFLAGS="$CPPFLAGS"
+	cf_save_CPPFLAGS="$CPPFLAGS"
+	cf_test_CPPFLAGS="$CPPFLAGS"
 
 cf_search=
 
@@ -15144,15 +15144,15 @@ test -d "$oldincludedir" && {
 
 cf_search="$cf_search $cf_header_path_list"
 
-    for cf_cv_header_path_gnutls in $cf_search
-    do
-      if test -d $cf_cv_header_path_gnutls ; then
-        test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
+	for cf_cv_header_path_gnutls in $cf_search
+	do
+		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}:15152: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
-        CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
-        cat >conftest.$ac_ext <<_ACEOF
+			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
+			cat >conftest.$ac_ext <<_ACEOF
 #line 15156 "configure"
 #include "confdefs.h"
 
@@ -15194,32 +15194,32 @@ if { (eval echo "$as_me:15185: \"$ac_compile\"") >&5
   echo "$as_me:15194: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-            test -n "$verbose" && echo "	... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
+				test -n "$verbose" && echo "	... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
 
 echo "${as_me:-configure}:15199: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
-            cf_cv_find_linkage_gnutls=maybe
-            cf_test_CPPFLAGS="$CPPFLAGS"
-            break
+				cf_cv_find_linkage_gnutls=maybe
+				cf_test_CPPFLAGS="$CPPFLAGS"
+				break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-            CPPFLAGS="$cf_save_CPPFLAGS"
+				CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-      fi
-    done
+		fi
+	done
 
-    if test "$cf_cv_find_linkage_gnutls" = maybe ; then
+	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
 echo "${as_me:-configure}:15217: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
-      cf_save_LIBS="$LIBS"
-      cf_save_LDFLAGS="$LDFLAGS"
+		cf_save_LIBS="$LIBS"
+		cf_save_LDFLAGS="$LDFLAGS"
 
-      if test "$cf_cv_find_linkage_gnutls" != yes ; then
+		if test "$cf_cv_find_linkage_gnutls" != yes ; then
 
 cf_search=
 cf_library_path_list=""
@@ -15284,17 +15284,17 @@ done
 
 cf_search="$cf_library_path_list $cf_search"
 
-        for cf_cv_library_path_gnutls in $cf_search
-        do
-          if test -d $cf_cv_library_path_gnutls ; then
-            test -n "$verbose" && echo "	... testing $cf_cv_library_path_gnutls" 1>&6
+			for cf_cv_library_path_gnutls in $cf_search
+			do
+				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}:15292: 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
+					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 15298 "configure"
 #include "confdefs.h"
 
@@ -15336,32 +15336,32 @@ if { (eval echo "$as_me:15327: \"$ac_link\"") >&5
   echo "$as_me:15336: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-                test -n "$verbose" && echo "	... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
+					test -n "$verbose" && echo "	... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
 
 echo "${as_me:-configure}:15341: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
-                cf_cv_find_linkage_gnutls=yes
-                cf_cv_library_file_gnutls="-lgnutls"
-                break
+					cf_cv_find_linkage_gnutls=yes
+					cf_cv_library_file_gnutls="-lgnutls"
+					break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-                CPPFLAGS="$cf_save_CPPFLAGS"
-                LIBS="$cf_save_LIBS"
-                LDFLAGS="$cf_save_LDFLAGS"
+					CPPFLAGS="$cf_save_CPPFLAGS"
+					LIBS="$cf_save_LIBS"
+					LDFLAGS="$cf_save_LDFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-          fi
-        done
-        CPPFLAGS="$cf_save_CPPFLAGS"
-        LDFLAGS="$cf_save_LDFLAGS"
-      fi
+				fi
+			done
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			LDFLAGS="$cf_save_LDFLAGS"
+		fi
 
-    else
-      cf_cv_find_linkage_gnutls=no
-    fi
+	else
+		cf_cv_find_linkage_gnutls=no
+	fi
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
@@ -15474,30 +15474,30 @@ fi
 		if test -n "$cf_cv_library_path_gnutls" ; then
 
 if test -n "$cf_cv_library_path_gnutls" ; then
-  for cf_add_libdir in $cf_cv_library_path_gnutls
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_cv_library_path_gnutls
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:15495: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 		fi
@@ -15913,59 +15913,59 @@ echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
 	if test -d $cf_searchpath/lib; then
 
 if test -n "$cf_searchpath/lib" ; then
-  for cf_add_libdir in $cf_searchpath/lib
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath/lib
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:15934: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	elif test -d $cf_searchpath ; then
 
 if test -n "$cf_searchpath" ; then
-  for cf_add_libdir in $cf_searchpath
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:15963: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	else
@@ -16256,14 +16256,14 @@ cat conftest.$ac_ext >&5
 	cf_cv_find_linkage_gnutls=no
 	LIBS="$cf_save_LIBS"
 
-    test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
+	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
 echo "${as_me:-configure}:16261: testing find linkage for gnutls library ..." 1>&5
 
 echo "${as_me:-configure}:16263: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
-    cf_save_CPPFLAGS="$CPPFLAGS"
-    cf_test_CPPFLAGS="$CPPFLAGS"
+	cf_save_CPPFLAGS="$CPPFLAGS"
+	cf_test_CPPFLAGS="$CPPFLAGS"
 
 cf_search=
 
@@ -16346,15 +16346,15 @@ test -d "$oldincludedir" && {
 
 cf_search="$cf_search $cf_header_path_list"
 
-    for cf_cv_header_path_gnutls in $cf_search
-    do
-      if test -d $cf_cv_header_path_gnutls ; then
-        test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
+	for cf_cv_header_path_gnutls in $cf_search
+	do
+		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}:16354: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
-        CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
-        cat >conftest.$ac_ext <<_ACEOF
+			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
+			cat >conftest.$ac_ext <<_ACEOF
 #line 16358 "configure"
 #include "confdefs.h"
 
@@ -16396,32 +16396,32 @@ if { (eval echo "$as_me:16387: \"$ac_compile\"") >&5
   echo "$as_me:16396: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-            test -n "$verbose" && echo "	... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
+				test -n "$verbose" && echo "	... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
 
 echo "${as_me:-configure}:16401: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
-            cf_cv_find_linkage_gnutls=maybe
-            cf_test_CPPFLAGS="$CPPFLAGS"
-            break
+				cf_cv_find_linkage_gnutls=maybe
+				cf_test_CPPFLAGS="$CPPFLAGS"
+				break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-            CPPFLAGS="$cf_save_CPPFLAGS"
+				CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-      fi
-    done
+		fi
+	done
 
-    if test "$cf_cv_find_linkage_gnutls" = maybe ; then
+	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
 echo "${as_me:-configure}:16419: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
-      cf_save_LIBS="$LIBS"
-      cf_save_LDFLAGS="$LDFLAGS"
+		cf_save_LIBS="$LIBS"
+		cf_save_LDFLAGS="$LDFLAGS"
 
-      if test "$cf_cv_find_linkage_gnutls" != yes ; then
+		if test "$cf_cv_find_linkage_gnutls" != yes ; then
 
 cf_search=
 cf_library_path_list=""
@@ -16486,17 +16486,17 @@ done
 
 cf_search="$cf_library_path_list $cf_search"
 
-        for cf_cv_library_path_gnutls in $cf_search
-        do
-          if test -d $cf_cv_library_path_gnutls ; then
-            test -n "$verbose" && echo "	... testing $cf_cv_library_path_gnutls" 1>&6
+			for cf_cv_library_path_gnutls in $cf_search
+			do
+				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}:16494: 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
+					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 16500 "configure"
 #include "confdefs.h"
 
@@ -16538,32 +16538,32 @@ if { (eval echo "$as_me:16529: \"$ac_link\"") >&5
   echo "$as_me:16538: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-                test -n "$verbose" && echo "	... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
+					test -n "$verbose" && echo "	... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
 
 echo "${as_me:-configure}:16543: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
-                cf_cv_find_linkage_gnutls=yes
-                cf_cv_library_file_gnutls="-lgnutls"
-                break
+					cf_cv_find_linkage_gnutls=yes
+					cf_cv_library_file_gnutls="-lgnutls"
+					break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-                CPPFLAGS="$cf_save_CPPFLAGS"
-                LIBS="$cf_save_LIBS"
-                LDFLAGS="$cf_save_LDFLAGS"
+					CPPFLAGS="$cf_save_CPPFLAGS"
+					LIBS="$cf_save_LIBS"
+					LDFLAGS="$cf_save_LDFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-          fi
-        done
-        CPPFLAGS="$cf_save_CPPFLAGS"
-        LDFLAGS="$cf_save_LDFLAGS"
-      fi
+				fi
+			done
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			LDFLAGS="$cf_save_LDFLAGS"
+		fi
 
-    else
-      cf_cv_find_linkage_gnutls=no
-    fi
+	else
+		cf_cv_find_linkage_gnutls=no
+	fi
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
@@ -16676,30 +16676,30 @@ fi
 		if test -n "$cf_cv_library_path_gnutls" ; then
 
 if test -n "$cf_cv_library_path_gnutls" ; then
-  for cf_add_libdir in $cf_cv_library_path_gnutls
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_cv_library_path_gnutls
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:16697: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 		fi
@@ -18158,34 +18158,34 @@ if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
 then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$withval" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval withval="$withval"
-  case ".$withval" in
-  (.NONE/*)
-    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval withval="$withval"
+	case ".$withval" in
+	(.NONE/*)
+		withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  { { echo "$as_me:18185: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18185: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
-  ;;
+	;;
 esac
 
 	if test -d "$cf_cv_curses_dir"
@@ -18269,30 +18269,30 @@ echo "${as_me:-configure}:18256: testing adding $cf_add_incdir to include-path .
 fi
 
 if test -n "$cf_cv_curses_dir/lib" ; then
-  for cf_add_libdir in $cf_cv_curses_dir/lib
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_cv_curses_dir/lib
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:18290: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	fi
@@ -18894,59 +18894,59 @@ fi
 		then
 
 if test -n "/lib64" ; then
-  for cf_add_libdir in /lib64
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in /lib64
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:18915: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 		else
 
 if test -n "/lib" ; then
-  for cf_add_libdir in /lib
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in /lib
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:18944: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 		fi
@@ -18954,30 +18954,30 @@ fi
 	(*)
 
 if test -n "/lib" ; then
-  for cf_add_libdir in /lib
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in /lib
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:18975: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 		;;
@@ -18989,30 +18989,30 @@ fi
 		if test -d /usr/5lib ; then
 
 if test -n "/usr/5lib" ; then
-  for cf_add_libdir in /usr/5lib
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in /usr/5lib
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:19010: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 cf_add_libs="-lcurses -ltermcap"
@@ -19659,14 +19659,14 @@ cat conftest.$ac_ext >&5
 	cf_cv_find_linkage_utf8=no
 	LIBS="$cf_save_LIBS"
 
-    test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
 echo "${as_me:-configure}:19664: testing find linkage for utf8 library ..." 1>&5
 
 echo "${as_me:-configure}:19666: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
-    cf_save_CPPFLAGS="$CPPFLAGS"
-    cf_test_CPPFLAGS="$CPPFLAGS"
+	cf_save_CPPFLAGS="$CPPFLAGS"
+	cf_test_CPPFLAGS="$CPPFLAGS"
 
 cf_search=
 
@@ -19749,15 +19749,15 @@ test -d "$oldincludedir" && {
 
 cf_search="$cf_search $cf_header_path_list"
 
-    for cf_cv_header_path_utf8 in $cf_search
-    do
-      if test -d $cf_cv_header_path_utf8 ; then
-        test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
+	for cf_cv_header_path_utf8 in $cf_search
+	do
+		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}:19757: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
-        CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
-        cat >conftest.$ac_ext <<_ACEOF
+			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
+			cat >conftest.$ac_ext <<_ACEOF
 #line 19761 "configure"
 #include "confdefs.h"
 
@@ -19783,32 +19783,32 @@ if { (eval echo "$as_me:19774: \"$ac_compile\"") >&5
   echo "$as_me:19783: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-            test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
+				test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 
 echo "${as_me:-configure}:19788: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
-            cf_cv_find_linkage_utf8=maybe
-            cf_test_CPPFLAGS="$CPPFLAGS"
-            break
+				cf_cv_find_linkage_utf8=maybe
+				cf_test_CPPFLAGS="$CPPFLAGS"
+				break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-            CPPFLAGS="$cf_save_CPPFLAGS"
+				CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-      fi
-    done
+		fi
+	done
 
-    if test "$cf_cv_find_linkage_utf8" = maybe ; then
+	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
 echo "${as_me:-configure}:19806: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
-      cf_save_LIBS="$LIBS"
-      cf_save_LDFLAGS="$LDFLAGS"
+		cf_save_LIBS="$LIBS"
+		cf_save_LDFLAGS="$LDFLAGS"
 
-      if test "$cf_cv_find_linkage_utf8" != yes ; then
+		if test "$cf_cv_find_linkage_utf8" != yes ; then
 
 cf_search=
 cf_library_path_list=""
@@ -19873,17 +19873,17 @@ done
 
 cf_search="$cf_library_path_list $cf_search"
 
-        for cf_cv_library_path_utf8 in $cf_search
-        do
-          if test -d $cf_cv_library_path_utf8 ; then
-            test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
+			for cf_cv_library_path_utf8 in $cf_search
+			do
+				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}:19881: 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
+					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 19887 "configure"
 #include "confdefs.h"
 
@@ -19909,32 +19909,32 @@ if { (eval echo "$as_me:19900: \"$ac_link\"") >&5
   echo "$as_me:19909: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-                test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
+					test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 
 echo "${as_me:-configure}:19914: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
-                cf_cv_find_linkage_utf8=yes
-                cf_cv_library_file_utf8="-lutf8"
-                break
+					cf_cv_find_linkage_utf8=yes
+					cf_cv_library_file_utf8="-lutf8"
+					break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-                CPPFLAGS="$cf_save_CPPFLAGS"
-                LIBS="$cf_save_LIBS"
-                LDFLAGS="$cf_save_LDFLAGS"
+					CPPFLAGS="$cf_save_CPPFLAGS"
+					LIBS="$cf_save_LIBS"
+					LDFLAGS="$cf_save_LDFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-          fi
-        done
-        CPPFLAGS="$cf_save_CPPFLAGS"
-        LDFLAGS="$cf_save_LDFLAGS"
-      fi
+				fi
+			done
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			LDFLAGS="$cf_save_LDFLAGS"
+		fi
 
-    else
-      cf_cv_find_linkage_utf8=no
-    fi
+	else
+		cf_cv_find_linkage_utf8=no
+	fi
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
@@ -20042,30 +20042,30 @@ echo "${as_me:-configure}:20029: testing adding $cf_add_incdir to include-path .
 fi
 
 if test -n "$cf_cv_library_path_utf8" ; then
-  for cf_add_libdir in $cf_cv_library_path_utf8
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_cv_library_path_utf8
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
 echo "${as_me:-configure}:20063: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 cf_add_libs="$cf_cv_library_file_utf8"
@@ -20087,15 +20087,132 @@ LIBS="$cf_add_libs"
 fi
 
 cf_ncuconfig_root=$cf_cv_screen
+cf_have_ncuconfig=no
+
+if test "x$PKG_CONFIG" != xnone; then
+	echo "$as_me:20093: checking pkg-config for $cf_ncuconfig_root" >&5
+echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
+	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
+		echo "$as_me:20096: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+		echo "$as_me:20099: checking if the $cf_ncuconfig_root package files work" >&5
+echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+		cf_have_ncuconfig=unknown
+
+		cf_save_CPPFLAGS="$CPPFLAGS"
+		cf_save_LIBS="$LIBS"
+
+		CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`"
+
+cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
+		cat >conftest.$ac_ext <<_ACEOF
+#line 20125 "configure"
+#include "confdefs.h"
+#include <${cf_cv_ncurses_header:-curses.h}>
+int
+main ()
+{
+initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:20137: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:20140: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:20143: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:20146: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:20149: 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 20154 "configure"
+#include "confdefs.h"
+#include <${cf_cv_ncurses_header:-curses.h}>
+				int main(void)
+				{ char *xx = curses_version(); return (xx == 0); }
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:20161: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:20164: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:20166: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:20169: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_have_ncuconfig=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_have_ncuconfig=no
+fi
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_have_ncuconfig=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+		echo "$as_me:20187: result: $cf_have_ncuconfig" >&5
+echo "${ECHO_T}$cf_have_ncuconfig" >&6
+		if test "$cf_have_ncuconfig" != "yes"
+		then
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			LIBS="$cf_save_LIBS"
+		else
+
+cat >>confdefs.h <<\EOF
+#define NCURSES 1
+EOF
+
+		fi
+
+	else
+		echo "$as_me:20202: result: no" >&5
+echo "${ECHO_T}no" >&6
+	fi
+fi
 
-echo "Looking for ${cf_ncuconfig_root}-config"
+if test "x$cf_have_ncuconfig" = "xno"; then
+	echo "Looking for ${cf_ncuconfig_root}-config"
 
 if test -n "$ac_tool_prefix"; then
   for ac_prog in ${cf_ncuconfig_root}-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
   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:20098: checking for $ac_word" >&5
+echo "$as_me:20215: 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
@@ -20110,7 +20227,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:20113: found $ac_dir/$ac_word" >&5
+echo "$as_me:20230: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -20118,10 +20235,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:20121: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:20238: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:20124: result: no" >&5
+  echo "$as_me:20241: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20134,7 +20251,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:20137: checking for $ac_word" >&5
+echo "$as_me:20254: 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
@@ -20149,7 +20266,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:20152: found $ac_dir/$ac_word" >&5
+echo "$as_me:20269: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -20157,10 +20274,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:20160: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:20277: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:20163: result: no" >&5
+  echo "$as_me:20280: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20171,9 +20288,9 @@ test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none"
   NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG
 fi
 
-if test "$NCURSES_CONFIG" != none ; then
+	if test "$NCURSES_CONFIG" != none ; then
 
-CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
+		CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
 
 cf_add_libs="`$NCURSES_CONFIG --libs`"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -20191,9 +20308,9 @@ do
 done
 LIBS="$cf_add_libs"
 
-# even with config script, some packages use no-override for curses.h
+		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:20196: checking if we have identified curses headers" >&5
+echo "$as_me:20313: 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
@@ -20205,7 +20322,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20208 "configure"
+#line 20325 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -20217,16 +20334,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20220: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20337: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20223: \$? = $ac_status" >&5
+  echo "$as_me:20340: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20343: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20229: \$? = $ac_status" >&5
+  echo "$as_me:20346: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -20237,11 +20354,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20240: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:20357: 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:20244: error: No curses header-files found" >&5
+	{ { echo "$as_me:20361: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20251,23 +20368,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:20254: checking for $ac_header" >&5
+echo "$as_me:20371: 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 20260 "configure"
+#line 20377 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20264: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20381: \"$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:20270: \$? = $ac_status" >&5
+  echo "$as_me:20387: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20286,7 +20403,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20289: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:20406: 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
@@ -20302,13 +20419,13 @@ EOF
 
 cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-cat >>confdefs.h <<EOF
+		cat >>confdefs.h <<EOF
 #define $cf_nculib_ROOT 1
 EOF
 
-cf_cv_ncurses_version=`$NCURSES_CONFIG --version`
+				cf_cv_ncurses_version=`$NCURSES_CONFIG --version`
 
-else
+	else
 
 cf_ncuhdr_root=$cf_cv_screen
 
@@ -20339,7 +20456,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 20342 "configure"
+#line 20459 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20351,16 +20468,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20354: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20471: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20357: \$? = $ac_status" >&5
+  echo "$as_me:20474: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20363: \$? = $ac_status" >&5
+  echo "$as_me:20480: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20377,7 +20494,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}:20380: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20497: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20394,7 +20511,7 @@ fi
 
 }
 
-echo "$as_me:20397: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:20514: 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
@@ -20406,7 +20523,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20409 "configure"
+#line 20526 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20430,16 +20547,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20433: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20550: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20436: \$? = $ac_status" >&5
+  echo "$as_me:20553: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20556: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20442: \$? = $ac_status" >&5
+  echo "$as_me:20559: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -20454,14 +20571,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:20457: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:20574: 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:20464: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:20581: 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
@@ -20579,7 +20696,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20582 "configure"
+#line 20699 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20591,16 +20708,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20594: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20711: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20597: \$? = $ac_status" >&5
+  echo "$as_me:20714: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20603: \$? = $ac_status" >&5
+  echo "$as_me:20720: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20617,7 +20734,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}:20620: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20737: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20638,7 +20755,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20641 "configure"
+#line 20758 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20662,16 +20779,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20665: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20782: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20668: \$? = $ac_status" >&5
+  echo "$as_me:20785: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20788: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20674: \$? = $ac_status" >&5
+  echo "$as_me:20791: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -20692,12 +20809,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:20695: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:20812: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:20700: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:20817: 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%/[^/]*$%%'`
@@ -20730,7 +20847,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20733 "configure"
+#line 20850 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20742,16 +20859,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20745: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20862: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20748: \$? = $ac_status" >&5
+  echo "$as_me:20865: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20868: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20754: \$? = $ac_status" >&5
+  echo "$as_me:20871: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20768,7 +20885,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}:20771: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20888: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20814,7 +20931,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:20817: checking for terminfo header" >&5
+echo "$as_me:20934: 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
@@ -20832,7 +20949,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20835 "configure"
+#line 20952 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20847,16 +20964,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20850: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20967: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20853: \$? = $ac_status" >&5
+  echo "$as_me:20970: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20856: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20973: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20859: \$? = $ac_status" >&5
+  echo "$as_me:20976: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -20872,7 +20989,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20875: result: $cf_cv_term_header" >&5
+echo "$as_me:20992: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -20910,7 +21027,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:20913: checking for ncurses version" >&5
+echo "$as_me:21030: 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
@@ -20936,10 +21053,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:20939: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:21056: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:20942: \$? = $ac_status" >&5
+  echo "$as_me:21059: \$? = $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%".*%%'`
@@ -20949,7 +21066,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20952 "configure"
+#line 21069 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20974,15 +21091,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20977: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21094: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20980: \$? = $ac_status" >&5
+  echo "$as_me:21097: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21099: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20985: \$? = $ac_status" >&5
+  echo "$as_me:21102: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -20996,7 +21113,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:20999: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:21116: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -21009,7 +21126,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:21012: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:21129: 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
@@ -21017,7 +21134,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21020 "configure"
+#line 21137 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21036,16 +21153,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21039: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21156: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21042: \$? = $ac_status" >&5
+  echo "$as_me:21159: \$? = $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:21162: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21048: \$? = $ac_status" >&5
+  echo "$as_me:21165: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -21056,10 +21173,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21059: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:21176: 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:21062: checking for initscr in -lgpm" >&5
+  echo "$as_me:21179: 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
@@ -21067,7 +21184,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21070 "configure"
+#line 21187 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21086,16 +21203,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21089: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21206: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21092: \$? = $ac_status" >&5
+  echo "$as_me:21209: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21095: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21212: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21098: \$? = $ac_status" >&5
+  echo "$as_me:21215: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -21106,7 +21223,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21109: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:21226: 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"
@@ -21121,7 +21238,7 @@ case $host_os in
 	# 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:21124: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:21241: 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
@@ -21129,7 +21246,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21132 "configure"
+#line 21249 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21148,16 +21265,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21151: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21268: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21154: \$? = $ac_status" >&5
+  echo "$as_me:21271: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21160: \$? = $ac_status" >&5
+  echo "$as_me:21277: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -21168,7 +21285,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21171: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:21288: 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"
@@ -21217,13 +21334,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:21220: checking for initscr" >&5
+	echo "$as_me:21337: 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 21226 "configure"
+#line 21343 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -21254,16 +21371,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:21257: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21374: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21260: \$? = $ac_status" >&5
+  echo "$as_me:21377: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21266: \$? = $ac_status" >&5
+  echo "$as_me:21383: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -21273,18 +21390,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21276: result: $ac_cv_func_initscr" >&5
+echo "$as_me:21393: 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:21283: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:21400: 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 21287 "configure"
+#line 21404 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21296,25 +21413,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21299: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21416: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21302: \$? = $ac_status" >&5
+  echo "$as_me:21419: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21305: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21308: \$? = $ac_status" >&5
+  echo "$as_me:21425: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21310: result: yes" >&5
+  echo "$as_me:21427: 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:21317: result: no" >&5
+echo "$as_me:21434: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -21382,11 +21499,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:21385: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:21502: 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 21389 "configure"
+#line 21506 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21398,25 +21515,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21401: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21518: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21404: \$? = $ac_status" >&5
+  echo "$as_me:21521: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21524: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21410: \$? = $ac_status" >&5
+  echo "$as_me:21527: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21412: result: yes" >&5
+  echo "$as_me:21529: 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:21419: result: no" >&5
+echo "$as_me:21536: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -21431,7 +21548,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:21434: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:21551: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21439,7 +21556,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:21442: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:21559: 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
@@ -21449,7 +21566,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21452 "configure"
+#line 21569 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21461,23 +21578,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21464: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21581: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21467: \$? = $ac_status" >&5
+  echo "$as_me:21584: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21473: \$? = $ac_status" >&5
+  echo "$as_me:21590: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21475: result: yes" >&5
+  echo "$as_me:21592: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:21480: result: no" >&5
+echo "$as_me:21597: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -21490,6 +21607,7 @@ cat >>confdefs.h <<EOF
 #define $cf_nculib_ROOT 1
 EOF
 
+	fi
 fi
 
 	cf_wide_curses=yes
@@ -21497,15 +21615,132 @@ fi
 (ncurses*)
 
 cf_ncuconfig_root=$cf_cv_screen
+cf_have_ncuconfig=no
+
+if test "x$PKG_CONFIG" != xnone; then
+	echo "$as_me:21621: checking pkg-config for $cf_ncuconfig_root" >&5
+echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
+	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
+		echo "$as_me:21624: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+		echo "$as_me:21627: checking if the $cf_ncuconfig_root package files work" >&5
+echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+		cf_have_ncuconfig=unknown
 
-echo "Looking for ${cf_ncuconfig_root}-config"
+		cf_save_CPPFLAGS="$CPPFLAGS"
+		cf_save_LIBS="$LIBS"
+
+		CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`"
+
+cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
+		cat >conftest.$ac_ext <<_ACEOF
+#line 21653 "configure"
+#include "confdefs.h"
+#include <${cf_cv_ncurses_header:-curses.h}>
+int
+main ()
+{
+initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:21665: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:21668: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:21671: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:21674: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:21677: 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 21682 "configure"
+#include "confdefs.h"
+#include <${cf_cv_ncurses_header:-curses.h}>
+				int main(void)
+				{ char *xx = curses_version(); return (xx == 0); }
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:21689: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:21692: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:21694: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:21697: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_have_ncuconfig=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_have_ncuconfig=no
+fi
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_have_ncuconfig=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+		echo "$as_me:21715: result: $cf_have_ncuconfig" >&5
+echo "${ECHO_T}$cf_have_ncuconfig" >&6
+		if test "$cf_have_ncuconfig" != "yes"
+		then
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			LIBS="$cf_save_LIBS"
+		else
+
+cat >>confdefs.h <<\EOF
+#define NCURSES 1
+EOF
+
+		fi
+
+	else
+		echo "$as_me:21730: result: no" >&5
+echo "${ECHO_T}no" >&6
+	fi
+fi
+
+if test "x$cf_have_ncuconfig" = "xno"; then
+	echo "Looking for ${cf_ncuconfig_root}-config"
 
 if test -n "$ac_tool_prefix"; then
   for ac_prog in ${cf_ncuconfig_root}-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
   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:21508: checking for $ac_word" >&5
+echo "$as_me:21743: 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
@@ -21520,7 +21755,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:21523: found $ac_dir/$ac_word" >&5
+echo "$as_me:21758: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -21528,10 +21763,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:21531: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:21766: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:21534: result: no" >&5
+  echo "$as_me:21769: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21544,7 +21779,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:21547: checking for $ac_word" >&5
+echo "$as_me:21782: 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
@@ -21559,7 +21794,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:21562: found $ac_dir/$ac_word" >&5
+echo "$as_me:21797: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -21567,10 +21802,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:21570: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:21805: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:21573: result: no" >&5
+  echo "$as_me:21808: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21581,9 +21816,9 @@ test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none"
   NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG
 fi
 
-if test "$NCURSES_CONFIG" != none ; then
+	if test "$NCURSES_CONFIG" != none ; then
 
-CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
+		CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
 
 cf_add_libs="`$NCURSES_CONFIG --libs`"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -21601,9 +21836,9 @@ do
 done
 LIBS="$cf_add_libs"
 
-# even with config script, some packages use no-override for curses.h
+		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:21606: checking if we have identified curses headers" >&5
+echo "$as_me:21841: 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
@@ -21615,7 +21850,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 21618 "configure"
+#line 21853 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -21627,16 +21862,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21630: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21865: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21633: \$? = $ac_status" >&5
+  echo "$as_me:21868: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21639: \$? = $ac_status" >&5
+  echo "$as_me:21874: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -21647,11 +21882,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:21650: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:21885: 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:21654: error: No curses header-files found" >&5
+	{ { echo "$as_me:21889: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21661,23 +21896,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:21664: checking for $ac_header" >&5
+echo "$as_me:21899: 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 21670 "configure"
+#line 21905 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21674: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21909: \"$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:21680: \$? = $ac_status" >&5
+  echo "$as_me:21915: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21696,7 +21931,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:21699: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21934: 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
@@ -21712,13 +21947,13 @@ EOF
 
 cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-cat >>confdefs.h <<EOF
+		cat >>confdefs.h <<EOF
 #define $cf_nculib_ROOT 1
 EOF
 
-cf_cv_ncurses_version=`$NCURSES_CONFIG --version`
+				cf_cv_ncurses_version=`$NCURSES_CONFIG --version`
 
-else
+	else
 
 cf_ncuhdr_root=$cf_cv_screen
 
@@ -21749,7 +21984,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 21752 "configure"
+#line 21987 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21761,16 +21996,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21764: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21999: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21767: \$? = $ac_status" >&5
+  echo "$as_me:22002: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21773: \$? = $ac_status" >&5
+  echo "$as_me:22008: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21787,7 +22022,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}:21790: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22025: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21804,7 +22039,7 @@ fi
 
 }
 
-echo "$as_me:21807: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:22042: 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
@@ -21816,7 +22051,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21819 "configure"
+#line 22054 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -21840,16 +22075,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21843: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22078: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21846: \$? = $ac_status" >&5
+  echo "$as_me:22081: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21852: \$? = $ac_status" >&5
+  echo "$as_me:22087: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -21864,14 +22099,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:21867: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:22102: 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:21874: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:22109: 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
@@ -21989,7 +22224,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21992 "configure"
+#line 22227 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22001,16 +22236,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22004: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22239: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22007: \$? = $ac_status" >&5
+  echo "$as_me:22242: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22013: \$? = $ac_status" >&5
+  echo "$as_me:22248: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22027,7 +22262,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}:22030: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22265: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22048,7 +22283,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22051 "configure"
+#line 22286 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -22072,16 +22307,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22075: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22310: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22078: \$? = $ac_status" >&5
+  echo "$as_me:22313: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22084: \$? = $ac_status" >&5
+  echo "$as_me:22319: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -22102,12 +22337,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:22105: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:22340: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:22110: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:22345: 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%/[^/]*$%%'`
@@ -22140,7 +22375,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22143 "configure"
+#line 22378 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22152,16 +22387,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22155: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22390: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22158: \$? = $ac_status" >&5
+  echo "$as_me:22393: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22161: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22396: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22164: \$? = $ac_status" >&5
+  echo "$as_me:22399: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22178,7 +22413,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}:22181: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22416: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22224,7 +22459,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:22227: checking for terminfo header" >&5
+echo "$as_me:22462: 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
@@ -22242,7 +22477,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 22245 "configure"
+#line 22480 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22257,16 +22492,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22260: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22495: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22263: \$? = $ac_status" >&5
+  echo "$as_me:22498: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22269: \$? = $ac_status" >&5
+  echo "$as_me:22504: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -22282,7 +22517,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:22285: result: $cf_cv_term_header" >&5
+echo "$as_me:22520: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -22320,7 +22555,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:22323: checking for ncurses version" >&5
+echo "$as_me:22558: 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
@@ -22346,10 +22581,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:22349: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:22584: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:22352: \$? = $ac_status" >&5
+  echo "$as_me:22587: \$? = $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%".*%%'`
@@ -22359,7 +22594,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22362 "configure"
+#line 22597 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22384,15 +22619,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22387: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22622: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22390: \$? = $ac_status" >&5
+  echo "$as_me:22625: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22395: \$? = $ac_status" >&5
+  echo "$as_me:22630: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -22406,7 +22641,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:22409: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:22644: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -22419,7 +22654,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:22422: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:22657: 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
@@ -22427,7 +22662,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22430 "configure"
+#line 22665 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22446,16 +22681,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22449: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22684: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22452: \$? = $ac_status" >&5
+  echo "$as_me:22687: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22455: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22458: \$? = $ac_status" >&5
+  echo "$as_me:22693: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -22466,10 +22701,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22469: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:22704: 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:22472: checking for initscr in -lgpm" >&5
+  echo "$as_me:22707: 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
@@ -22477,7 +22712,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22480 "configure"
+#line 22715 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22496,16 +22731,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22499: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22734: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22502: \$? = $ac_status" >&5
+  echo "$as_me:22737: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22508: \$? = $ac_status" >&5
+  echo "$as_me:22743: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -22516,7 +22751,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22519: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:22754: 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"
@@ -22531,7 +22766,7 @@ case $host_os in
 	# 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:22534: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:22769: 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
@@ -22539,7 +22774,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22542 "configure"
+#line 22777 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22558,16 +22793,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22561: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22564: \$? = $ac_status" >&5
+  echo "$as_me:22799: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22567: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22570: \$? = $ac_status" >&5
+  echo "$as_me:22805: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -22578,7 +22813,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22581: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:22816: 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"
@@ -22627,13 +22862,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:22630: checking for initscr" >&5
+	echo "$as_me:22865: 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 22636 "configure"
+#line 22871 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -22664,16 +22899,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:22667: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22902: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22670: \$? = $ac_status" >&5
+  echo "$as_me:22905: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22673: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22908: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22676: \$? = $ac_status" >&5
+  echo "$as_me:22911: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -22683,18 +22918,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22686: result: $ac_cv_func_initscr" >&5
+echo "$as_me:22921: 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:22693: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:22928: 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 22697 "configure"
+#line 22932 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22706,25 +22941,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22709: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22944: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22712: \$? = $ac_status" >&5
+  echo "$as_me:22947: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22718: \$? = $ac_status" >&5
+  echo "$as_me:22953: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22720: result: yes" >&5
+  echo "$as_me:22955: 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:22727: result: no" >&5
+echo "$as_me:22962: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -22792,11 +23027,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:22795: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:23030: 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 22799 "configure"
+#line 23034 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22808,25 +23043,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22811: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23046: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22814: \$? = $ac_status" >&5
+  echo "$as_me:23049: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22820: \$? = $ac_status" >&5
+  echo "$as_me:23055: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22822: result: yes" >&5
+  echo "$as_me:23057: 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:22829: result: no" >&5
+echo "$as_me:23064: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -22841,7 +23076,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:22844: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:23079: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22849,7 +23084,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:22852: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:23087: 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
@@ -22859,7 +23094,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22862 "configure"
+#line 23097 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22871,23 +23106,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22874: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23109: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22877: \$? = $ac_status" >&5
+  echo "$as_me:23112: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22883: \$? = $ac_status" >&5
+  echo "$as_me:23118: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22885: result: yes" >&5
+  echo "$as_me:23120: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:22890: result: no" >&5
+echo "$as_me:23125: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -22900,6 +23135,7 @@ cat >>confdefs.h <<EOF
 #define $cf_nculib_ROOT 1
 EOF
 
+	fi
 fi
 
 	;;
@@ -22916,7 +23152,7 @@ fi
 	;;
 (slang)
 
-echo "$as_me:22919: checking for slang header file" >&5
+echo "$as_me:23155: 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
@@ -22924,7 +23160,7 @@ else
 
 	cf_cv_slang_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22927 "configure"
+#line 23163 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -22936,16 +23172,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22939: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23175: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22942: \$? = $ac_status" >&5
+  echo "$as_me:23178: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22948: \$? = $ac_status" >&5
+  echo "$as_me:23184: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -23050,7 +23286,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23053: result: $cf_cv_slang_header" >&5
+echo "$as_me:23289: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 
 if test "x$cf_cv_slang_header" != xno
@@ -23091,7 +23327,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 23094 "configure"
+#line 23330 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23103,16 +23339,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23106: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23342: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23109: \$? = $ac_status" >&5
+  echo "$as_me:23345: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23112: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23115: \$? = $ac_status" >&5
+  echo "$as_me:23351: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -23129,7 +23365,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}:23132: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23368: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -23159,7 +23395,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 23162 "configure"
+#line 23398 "configure"
 #include "confdefs.h"
 
 int
@@ -23171,19 +23407,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23174: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23410: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23177: \$? = $ac_status" >&5
+  echo "$as_me:23413: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23416: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23183: \$? = $ac_status" >&5
+  echo "$as_me:23419: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 23186 "configure"
+#line 23422 "configure"
 #include "confdefs.h"
 
 int
@@ -23195,16 +23431,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23434: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23201: \$? = $ac_status" >&5
+  echo "$as_me:23437: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23207: \$? = $ac_status" >&5
+  echo "$as_me:23443: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -23215,7 +23451,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}:23218: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:23454: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -23230,10 +23466,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:23233: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:23469: 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 23236 "configure"
+#line 23472 "configure"
 #include "confdefs.h"
 
 int
@@ -23245,16 +23481,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23248: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23484: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23251: \$? = $ac_status" >&5
+  echo "$as_me:23487: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23257: \$? = $ac_status" >&5
+  echo "$as_me:23493: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -23263,7 +23499,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:23266: result: $cf_result" >&5
+			echo "$as_me:23502: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -23280,7 +23516,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:23283: checking for initscr in -lcurses" >&5
+	echo "$as_me:23519: 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
@@ -23288,7 +23524,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23291 "configure"
+#line 23527 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23307,16 +23543,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23310: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23546: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23313: \$? = $ac_status" >&5
+  echo "$as_me:23549: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23319: \$? = $ac_status" >&5
+  echo "$as_me:23555: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -23327,7 +23563,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23330: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:23566: 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
 
@@ -23349,7 +23585,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:23352: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:23588: 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
@@ -23357,7 +23593,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23360 "configure"
+#line 23596 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23376,16 +23612,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23379: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23615: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23382: \$? = $ac_status" >&5
+  echo "$as_me:23618: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23388: \$? = $ac_status" >&5
+  echo "$as_me:23624: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -23396,7 +23632,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23399: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:23635: 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
 
@@ -23423,20 +23659,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:23426: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:23662: 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:23433: checking for acos" >&5
+echo "$as_me:23669: 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 23439 "configure"
+#line 23675 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -23467,16 +23703,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:23470: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23706: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23473: \$? = $ac_status" >&5
+  echo "$as_me:23709: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23479: \$? = $ac_status" >&5
+  echo "$as_me:23715: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -23486,13 +23722,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23489: result: $ac_cv_func_acos" >&5
+echo "$as_me:23725: 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:23495: checking for acos in -lm" >&5
+echo "$as_me:23731: 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
@@ -23500,7 +23736,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23503 "configure"
+#line 23739 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23519,16 +23755,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23522: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23525: \$? = $ac_status" >&5
+  echo "$as_me:23761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23531: \$? = $ac_status" >&5
+  echo "$as_me:23767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -23539,7 +23775,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23542: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:23778: 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
 
@@ -23565,13 +23801,13 @@ case $host_os in
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:23568: checking for v_init" >&5
+	echo "$as_me:23804: 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 23574 "configure"
+#line 23810 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -23602,16 +23838,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:23605: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23841: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23608: \$? = $ac_status" >&5
+  echo "$as_me:23844: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23614: \$? = $ac_status" >&5
+  echo "$as_me:23850: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -23621,18 +23857,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23624: result: $ac_cv_func_v_init" >&5
+echo "$as_me:23860: 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:23631: checking for v_init in -lvideo" >&5
+		echo "$as_me:23867: 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 23635 "configure"
+#line 23871 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -23644,25 +23880,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23647: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23883: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23650: \$? = $ac_status" >&5
+  echo "$as_me:23886: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23656: \$? = $ac_status" >&5
+  echo "$as_me:23892: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23658: result: yes" >&5
+  echo "$as_me:23894: 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:23665: result: no" >&5
+echo "$as_me:23901: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23730,11 +23966,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23733: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:23969: 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 23737 "configure"
+#line 23973 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -23746,25 +23982,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23749: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23985: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23752: \$? = $ac_status" >&5
+  echo "$as_me:23988: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23758: \$? = $ac_status" >&5
+  echo "$as_me:23994: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23760: result: yes" >&5
+  echo "$as_me:23996: 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:23767: result: no" >&5
+echo "$as_me:24003: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -23779,7 +24015,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:23782: error: Cannot link video library" >&5
+	{ { echo "$as_me:24018: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -23789,13 +24025,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:23792: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:24028: 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 23798 "configure"
+#line 24034 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -23826,16 +24062,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:23829: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24065: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23832: \$? = $ac_status" >&5
+  echo "$as_me:24068: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23838: \$? = $ac_status" >&5
+  echo "$as_me:24074: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -23845,18 +24081,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:23848: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:24084: 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:23855: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:24091: 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 23859 "configure"
+#line 24095 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23868,25 +24104,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23871: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24107: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23874: \$? = $ac_status" >&5
+  echo "$as_me:24110: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23880: \$? = $ac_status" >&5
+  echo "$as_me:24116: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23882: result: yes" >&5
+  echo "$as_me:24118: 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:23889: result: no" >&5
+echo "$as_me:24125: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23954,11 +24190,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23957: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:24193: 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 23961 "configure"
+#line 24197 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23970,25 +24206,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23973: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24209: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23976: \$? = $ac_status" >&5
+  echo "$as_me:24212: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24215: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23982: \$? = $ac_status" >&5
+  echo "$as_me:24218: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23984: result: yes" >&5
+  echo "$as_me:24220: 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:23991: result: no" >&5
+echo "$as_me:24227: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24003,13 +24239,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:24006: error: Cannot link slang library" >&5
+	{ { echo "$as_me:24242: 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:24012: checking if we can link slang without termcap" >&5
+echo "$as_me:24248: 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%^.%%'`
@@ -24018,7 +24254,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 24021 "configure"
+#line 24257 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24030,16 +24266,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24269: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24036: \$? = $ac_status" >&5
+  echo "$as_me:24272: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24042: \$? = $ac_status" >&5
+  echo "$as_me:24278: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -24048,13 +24284,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:24051: result: $cf_result" >&5
+echo "$as_me:24287: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 else
 
-echo "$as_me:24057: checking for slang2 header file" >&5
+echo "$as_me:24293: 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
@@ -24062,7 +24298,7 @@ else
 
 	cf_cv_slang2_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24065 "configure"
+#line 24301 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24074,16 +24310,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24077: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24313: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24080: \$? = $ac_status" >&5
+  echo "$as_me:24316: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24086: \$? = $ac_status" >&5
+  echo "$as_me:24322: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang2_header=predefined
 else
@@ -24188,7 +24424,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24191: result: $cf_cv_slang2_header" >&5
+echo "$as_me:24427: result: $cf_cv_slang2_header" >&5
 echo "${ECHO_T}$cf_cv_slang2_header" >&6
 
 if test "x$cf_cv_slang2_header" != xno
@@ -24229,7 +24465,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 24232 "configure"
+#line 24468 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24241,16 +24477,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24244: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24480: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24247: \$? = $ac_status" >&5
+  echo "$as_me:24483: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24250: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24253: \$? = $ac_status" >&5
+  echo "$as_me:24489: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24267,7 +24503,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}:24270: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24506: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24297,7 +24533,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 24300 "configure"
+#line 24536 "configure"
 #include "confdefs.h"
 
 int
@@ -24309,19 +24545,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24312: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24548: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24315: \$? = $ac_status" >&5
+  echo "$as_me:24551: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24321: \$? = $ac_status" >&5
+  echo "$as_me:24557: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 24324 "configure"
+#line 24560 "configure"
 #include "confdefs.h"
 
 int
@@ -24333,16 +24569,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24336: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24339: \$? = $ac_status" >&5
+  echo "$as_me:24575: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24345: \$? = $ac_status" >&5
+  echo "$as_me:24581: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -24353,7 +24589,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}:24356: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:24592: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -24368,10 +24604,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:24371: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:24607: 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 24374 "configure"
+#line 24610 "configure"
 #include "confdefs.h"
 
 int
@@ -24383,16 +24619,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24386: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24622: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24389: \$? = $ac_status" >&5
+  echo "$as_me:24625: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24628: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24395: \$? = $ac_status" >&5
+  echo "$as_me:24631: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -24401,7 +24637,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:24404: result: $cf_result" >&5
+			echo "$as_me:24640: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -24418,7 +24654,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:24421: checking for initscr in -lcurses" >&5
+	echo "$as_me:24657: 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
@@ -24426,7 +24662,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24429 "configure"
+#line 24665 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24445,16 +24681,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24448: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24684: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24451: \$? = $ac_status" >&5
+  echo "$as_me:24687: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24457: \$? = $ac_status" >&5
+  echo "$as_me:24693: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -24465,7 +24701,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24468: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:24704: 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
 
@@ -24487,7 +24723,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:24490: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:24726: 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
@@ -24495,7 +24731,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24498 "configure"
+#line 24734 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24514,16 +24750,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24517: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24753: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24520: \$? = $ac_status" >&5
+  echo "$as_me:24756: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24526: \$? = $ac_status" >&5
+  echo "$as_me:24762: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -24534,7 +24770,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24537: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:24773: 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
 
@@ -24561,20 +24797,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:24564: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:24800: 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:24571: checking for acos" >&5
+echo "$as_me:24807: 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 24577 "configure"
+#line 24813 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -24605,16 +24841,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:24608: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24844: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24611: \$? = $ac_status" >&5
+  echo "$as_me:24847: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24850: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24617: \$? = $ac_status" >&5
+  echo "$as_me:24853: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -24624,13 +24860,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24627: result: $ac_cv_func_acos" >&5
+echo "$as_me:24863: 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:24633: checking for acos in -lm" >&5
+echo "$as_me:24869: 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
@@ -24638,7 +24874,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24641 "configure"
+#line 24877 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24657,16 +24893,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24660: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24896: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24663: \$? = $ac_status" >&5
+  echo "$as_me:24899: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24669: \$? = $ac_status" >&5
+  echo "$as_me:24905: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -24677,7 +24913,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24680: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:24916: 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
 
@@ -24703,13 +24939,13 @@ case $host_os in
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:24706: checking for v_init" >&5
+	echo "$as_me:24942: 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 24712 "configure"
+#line 24948 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -24740,16 +24976,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:24743: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24979: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24746: \$? = $ac_status" >&5
+  echo "$as_me:24982: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24752: \$? = $ac_status" >&5
+  echo "$as_me:24988: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -24759,18 +24995,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24762: result: $ac_cv_func_v_init" >&5
+echo "$as_me:24998: 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:24769: checking for v_init in -lvideo" >&5
+		echo "$as_me:25005: 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 24773 "configure"
+#line 25009 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -24782,25 +25018,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24785: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25021: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24788: \$? = $ac_status" >&5
+  echo "$as_me:25024: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24791: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24794: \$? = $ac_status" >&5
+  echo "$as_me:25030: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24796: result: yes" >&5
+  echo "$as_me:25032: 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:24803: result: no" >&5
+echo "$as_me:25039: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -24868,11 +25104,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:24871: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:25107: 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 24875 "configure"
+#line 25111 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -24884,25 +25120,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24887: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25123: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24890: \$? = $ac_status" >&5
+  echo "$as_me:25126: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24896: \$? = $ac_status" >&5
+  echo "$as_me:25132: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24898: result: yes" >&5
+  echo "$as_me:25134: 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:24905: result: no" >&5
+echo "$as_me:25141: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24917,7 +25153,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:24920: error: Cannot link video library" >&5
+	{ { echo "$as_me:25156: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -24927,13 +25163,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang2'=no'
 	cf_libdir=""
-	echo "$as_me:24930: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:25166: 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 24936 "configure"
+#line 25172 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -24964,16 +25200,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:24967: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25203: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24970: \$? = $ac_status" >&5
+  echo "$as_me:25206: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25209: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24976: \$? = $ac_status" >&5
+  echo "$as_me:25212: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -24983,18 +25219,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:24986: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:25222: 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:24993: checking for SLtt_get_screen_size in -lslang2" >&5
+		echo "$as_me:25229: 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 24997 "configure"
+#line 25233 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25006,25 +25242,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25009: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25245: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25012: \$? = $ac_status" >&5
+  echo "$as_me:25248: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25251: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25018: \$? = $ac_status" >&5
+  echo "$as_me:25254: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25020: result: yes" >&5
+  echo "$as_me:25256: 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:25027: result: no" >&5
+echo "$as_me:25263: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -25092,11 +25328,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25095: checking for -lslang2 in $cf_libdir" >&5
+				echo "$as_me:25331: 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 25099 "configure"
+#line 25335 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25108,25 +25344,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25111: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25347: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25114: \$? = $ac_status" >&5
+  echo "$as_me:25350: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25353: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25120: \$? = $ac_status" >&5
+  echo "$as_me:25356: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25122: result: yes" >&5
+  echo "$as_me:25358: 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:25129: result: no" >&5
+echo "$as_me:25365: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25141,13 +25377,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang2
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:25144: error: Cannot link slang2 library" >&5
+	{ { echo "$as_me:25380: 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:25150: checking if we can link slang2 without termcap" >&5
+echo "$as_me:25386: 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%^.%%'`
@@ -25156,7 +25392,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 25159 "configure"
+#line 25395 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25168,16 +25404,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25171: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25407: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25174: \$? = $ac_status" >&5
+  echo "$as_me:25410: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25180: \$? = $ac_status" >&5
+  echo "$as_me:25416: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -25186,12 +25422,12 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:25189: result: $cf_result" >&5
+echo "$as_me:25425: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 	else
-		{ { echo "$as_me:25194: error: cannot find slang headers" >&5
+		{ { echo "$as_me:25430: error: cannot find slang headers" >&5
 echo "$as_me: error: cannot find slang headers" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -25199,14 +25435,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:25202: checking if we must define UTF8" >&5
+echo "$as_me:25438: 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 25209 "configure"
+#line 25445 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25218,16 +25454,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25221: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25457: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25224: \$? = $ac_status" >&5
+  echo "$as_me:25460: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25230: \$? = $ac_status" >&5
+  echo "$as_me:25466: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -25235,7 +25471,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25238 "configure"
+#line 25474 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -25249,16 +25485,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25252: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25488: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25255: \$? = $ac_status" >&5
+  echo "$as_me:25491: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25261: \$? = $ac_status" >&5
+  echo "$as_me:25497: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -25271,7 +25507,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:25274: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:25510: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -25282,14 +25518,14 @@ EOF
 
 fi
 
-echo "$as_me:25285: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:25521: 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 25292 "configure"
+#line 25528 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25308,16 +25544,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25311: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25547: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25314: \$? = $ac_status" >&5
+  echo "$as_me:25550: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25320: \$? = $ac_status" >&5
+  echo "$as_me:25556: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -25328,20 +25564,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:25331: result: $cf_cv_slang_unix" >&5
+echo "$as_me:25567: 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:25338: checking for SLsmg_Color_Type" >&5
+	echo "$as_me:25574: 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 25344 "configure"
+#line 25580 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -25357,16 +25593,16 @@ if (sizeof (SLsmg_Color_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25360: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25596: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25363: \$? = $ac_status" >&5
+  echo "$as_me:25599: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25602: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25369: \$? = $ac_status" >&5
+  echo "$as_me:25605: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLsmg_Color_Type=yes
 else
@@ -25376,7 +25612,7 @@ ac_cv_type_SLsmg_Color_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25379: result: $ac_cv_type_SLsmg_Color_Type" >&5
+echo "$as_me:25615: 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
@@ -25392,13 +25628,13 @@ EOF
 
 fi
 
-	echo "$as_me:25395: checking for SLtt_Char_Type" >&5
+	echo "$as_me:25631: 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 25401 "configure"
+#line 25637 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -25414,16 +25650,16 @@ if (sizeof (SLtt_Char_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25417: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25653: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25420: \$? = $ac_status" >&5
+  echo "$as_me:25656: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25426: \$? = $ac_status" >&5
+  echo "$as_me:25662: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLtt_Char_Type=yes
 else
@@ -25433,7 +25669,7 @@ ac_cv_type_SLtt_Char_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25436: result: $ac_cv_type_SLtt_Char_Type" >&5
+echo "$as_me:25672: 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
@@ -25453,14 +25689,14 @@ fi
 	;;
 esac
 
-echo "$as_me:25456: checking for chtype typedef" >&5
+echo "$as_me:25692: 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 25463 "configure"
+#line 25699 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25472,16 +25708,16 @@ chtype foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25475: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25711: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25478: \$? = $ac_status" >&5
+  echo "$as_me:25714: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25484: \$? = $ac_status" >&5
+  echo "$as_me:25720: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -25491,7 +25727,7 @@ cf_cv_chtype_decl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25494: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:25730: result: $cf_cv_chtype_decl" >&5
 echo "${ECHO_T}$cf_cv_chtype_decl" >&6
 if test $cf_cv_chtype_decl = yes ; then
 
@@ -25499,14 +25735,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_CHTYPE 1
 EOF
 
-	echo "$as_me:25502: checking if chtype is scalar or struct" >&5
+	echo "$as_me:25738: 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 25509 "configure"
+#line 25745 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25518,16 +25754,16 @@ chtype foo; long x = foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25521: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25757: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25524: \$? = $ac_status" >&5
+  echo "$as_me:25760: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25763: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25530: \$? = $ac_status" >&5
+  echo "$as_me:25766: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -25537,7 +25773,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25540: result: $cf_cv_chtype_type" >&5
+echo "$as_me:25776: result: $cf_cv_chtype_type" >&5
 echo "${ECHO_T}$cf_cv_chtype_type" >&6
 	if test $cf_cv_chtype_type = scalar ; then
 
@@ -25548,7 +25784,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25551: checking if you want the wide-curses features" >&5
+echo "$as_me:25787: 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.
@@ -25565,10 +25801,10 @@ else
   use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:25568: result: $use_wide_curses" >&5
+echo "$as_me:25804: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:25571: checking if color-style code should be used" >&5
+echo "$as_me:25807: 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.
@@ -25588,7 +25824,7 @@ fi;
 
 case $use_color_style in
 (no)
-	echo "$as_me:25591: result: no" >&5
+	echo "$as_me:25827: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -25598,10 +25834,10 @@ cat >>confdefs.h <<\EOF
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:25601: result: yes" >&5
+	echo "$as_me:25837: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:25604: checking for location of style-sheet file" >&5
+	echo "$as_me:25840: 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.
@@ -25613,40 +25849,40 @@ else
 fi; if test -n "$sysconfdir/lynx.lss" ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$withval" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval withval="$withval"
-  case ".$withval" in
-  (.NONE/*)
-    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval withval="$withval"
+	case ".$withval" in
+	(.NONE/*)
+		withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  { { echo "$as_me:25640: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:25876: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
-  ;;
+	;;
 esac
 
 fi
 eval LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:25649: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:25885: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -25659,7 +25895,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:25662: checking for the default configuration-file" >&5
+echo "$as_me:25898: 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.
@@ -25671,40 +25907,40 @@ else
 fi; if test -n "$sysconfdir/lynx.cfg" ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$withval" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval withval="$withval"
-  case ".$withval" in
-  (.NONE/*)
-    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval withval="$withval"
+	case ".$withval" in
+	(.NONE/*)
+		withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  { { echo "$as_me:25698: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:25934: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
-  ;;
+	;;
 esac
 
 fi
 eval LYNX_CFG_FILE="$withval"
 
-echo "$as_me:25707: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:25943: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -25713,7 +25949,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:25716: checking for the default configuration-path" >&5
+echo "$as_me:25952: 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.
@@ -25725,40 +25961,40 @@ else
 fi; if test -n "$sysconfdir" ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$withval" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval withval="$withval"
-  case ".$withval" in
-  (.NONE/*)
-    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval withval="$withval"
+	case ".$withval" in
+	(.NONE/*)
+		withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  { { echo "$as_me:25752: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:25988: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
-  ;;
+	;;
 esac
 
 fi
 eval LYNX_CFG_PATH="$withval"
 
-echo "$as_me:25761: result: $LYNX_CFG_PATH" >&5
+echo "$as_me:25997: result: $LYNX_CFG_PATH" >&5
 echo "${ECHO_T}$LYNX_CFG_PATH" >&6
 
 test -z "$LYNX_CFG_PATH" && `echo "$LYNX_CFG_FILE" | sed -e 's%/[^/]*$%%'`
@@ -25768,7 +26004,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_PATH "$LYNX_CFG_PATH"
 EOF
 
-echo "$as_me:25771: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:26007: 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.
@@ -25785,7 +26021,7 @@ else
   use_htmlized_cfg=no
 
 fi;
-echo "$as_me:25788: result: $use_htmlized_cfg" >&5
+echo "$as_me:26024: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -25793,7 +26029,7 @@ if test $use_htmlized_cfg = no ; then
 	LYNXCFG_MAKE='#'
 fi
 
-echo "$as_me:25796: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:26032: 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.
@@ -25810,7 +26046,7 @@ else
   use_local_docs=no
 
 fi;
-echo "$as_me:25813: result: $use_local_docs" >&5
+echo "$as_me:26049: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -25818,7 +26054,7 @@ if test $use_local_docs = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:25821: checking for MIME library directory" >&5
+echo "$as_me:26057: 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.
@@ -25830,40 +26066,40 @@ else
 fi; if true ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$withval" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval withval="$withval"
-  case ".$withval" in
-  (.NONE/*)
-    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval withval="$withval"
+	case ".$withval" in
+	(.NONE/*)
+		withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  { { echo "$as_me:25857: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:26093: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
-  ;;
+	;;
 esac
 
 fi
 eval MIME_LIBDIR="$withval"
 
-echo "$as_me:25866: result: $MIME_LIBDIR" >&5
+echo "$as_me:26102: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 
@@ -25871,7 +26107,7 @@ cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:25874: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:26110: 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.
@@ -25888,7 +26124,7 @@ else
   use_locale_charset=yes
 
 fi;
-echo "$as_me:25891: result: $use_locale_charset" >&5
+echo "$as_me:26127: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test $use_locale_charset != no &&
 cat >>confdefs.h <<\EOF
@@ -25897,7 +26133,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:25900: checking if you want only a few charsets" >&5
+echo "$as_me:26136: 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.
@@ -25909,7 +26145,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:25912: result: yes" >&5
+	echo "$as_me:26148: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -25923,7 +26159,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}:25926: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me:-configure}:26162: 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'`
@@ -25950,28 +26186,28 @@ echo "${as_me:-configure}:25926: testing using minimal list of charsets: $cf_min
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me:-configure}:25953: testing found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:26189: 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}:25959: testing not found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:26195: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:25964: result: no" >&5
+	echo "$as_me:26200: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25968: checking for ANSI C header files" >&5
+echo "$as_me:26204: 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 25974 "configure"
+#line 26210 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -25979,13 +26215,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:25982: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26218: \"$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:25988: \$? = $ac_status" >&5
+  echo "$as_me:26224: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26007,7 +26243,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 26010 "configure"
+#line 26246 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -26025,7 +26261,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 26028 "configure"
+#line 26264 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -26046,7 +26282,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26049 "configure"
+#line 26285 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -26072,15 +26308,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26075: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26311: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26078: \$? = $ac_status" >&5
+  echo "$as_me:26314: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26083: \$? = $ac_status" >&5
+  echo "$as_me:26319: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26093,7 +26329,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:26096: result: $ac_cv_header_stdc" >&5
+echo "$as_me:26332: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -26103,13 +26339,13 @@ EOF
 
 fi
 
-echo "$as_me:26106: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:26342: 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 26112 "configure"
+#line 26348 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -26125,16 +26361,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26128: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26364: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26131: \$? = $ac_status" >&5
+  echo "$as_me:26367: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26137: \$? = $ac_status" >&5
+  echo "$as_me:26373: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -26144,7 +26380,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26147: result: $ac_cv_header_time" >&5
+echo "$as_me:26383: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -26157,13 +26393,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:26160: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:26396: 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 26166 "configure"
+#line 26402 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -26178,16 +26414,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26181: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26417: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26184: \$? = $ac_status" >&5
+  echo "$as_me:26420: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26190: \$? = $ac_status" >&5
+  echo "$as_me:26426: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -26197,7 +26433,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26200: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26436: 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
@@ -26210,7 +26446,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:26213: checking for opendir in -ldir" >&5
+  echo "$as_me:26449: 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
@@ -26218,7 +26454,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 26221 "configure"
+#line 26457 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -26237,16 +26473,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26240: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26476: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26243: \$? = $ac_status" >&5
+  echo "$as_me:26479: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26249: \$? = $ac_status" >&5
+  echo "$as_me:26485: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -26257,14 +26493,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:26260: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:26496: 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:26267: checking for opendir in -lx" >&5
+  echo "$as_me:26503: 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
@@ -26272,7 +26508,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 26275 "configure"
+#line 26511 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -26291,16 +26527,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26294: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26530: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26297: \$? = $ac_status" >&5
+  echo "$as_me:26533: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26303: \$? = $ac_status" >&5
+  echo "$as_me:26539: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -26311,7 +26547,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:26314: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:26550: 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"
@@ -26339,23 +26575,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26342: checking for $ac_header" >&5
+echo "$as_me:26578: 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 26348 "configure"
+#line 26584 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26352: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26588: \"$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:26358: \$? = $ac_status" >&5
+  echo "$as_me:26594: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26374,7 +26610,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26377: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26613: 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
@@ -26384,14 +26620,14 @@ EOF
 fi
 done
 
-echo "$as_me:26387: checking termio.h and termios.h" >&5
+echo "$as_me:26623: 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 26394 "configure"
+#line 26630 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -26409,16 +26645,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26412: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26648: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26415: \$? = $ac_status" >&5
+  echo "$as_me:26651: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26421: \$? = $ac_status" >&5
+  echo "$as_me:26657: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -26429,21 +26665,21 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:26432: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:26668: 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:26439: checking for sigaction and structs" >&5
+echo "$as_me:26675: 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 26446 "configure"
+#line 26682 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26463,16 +26699,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26466: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26702: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26469: \$? = $ac_status" >&5
+  echo "$as_me:26705: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26475: \$? = $ac_status" >&5
+  echo "$as_me:26711: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -26483,7 +26719,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:26486: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:26722: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes &&
 cat >>confdefs.h <<\EOF
@@ -26493,23 +26729,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:26496: checking for $ac_header" >&5
+echo "$as_me:26732: 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 26502 "configure"
+#line 26738 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26506: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26742: \"$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:26512: \$? = $ac_status" >&5
+  echo "$as_me:26748: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26528,7 +26764,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26531: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26767: 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
@@ -26549,23 +26785,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26552: checking for $ac_header" >&5
+echo "$as_me:26788: 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 26558 "configure"
+#line 26794 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26562: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26798: \"$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:26568: \$? = $ac_status" >&5
+  echo "$as_me:26804: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26584,7 +26820,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26587: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26823: 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
@@ -26597,23 +26833,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26600: checking for $ac_header" >&5
+echo "$as_me:26836: 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 26606 "configure"
+#line 26842 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26610: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26846: \"$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:26616: \$? = $ac_status" >&5
+  echo "$as_me:26852: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26632,7 +26868,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26635: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26871: 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
@@ -26654,14 +26890,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:26657: checking for union wait" >&5
+echo "$as_me:26893: 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 26664 "configure"
+#line 26900 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -26677,16 +26913,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26680: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26916: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26683: \$? = $ac_status" >&5
+  echo "$as_me:26919: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26689: \$? = $ac_status" >&5
+  echo "$as_me:26925: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -26696,7 +26932,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 26699 "configure"
+#line 26935 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -26716,16 +26952,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26719: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26955: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26722: \$? = $ac_status" >&5
+  echo "$as_me:26958: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26728: \$? = $ac_status" >&5
+  echo "$as_me:26964: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -26740,7 +26976,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:26743: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:26979: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test $cf_cv_type_unionwait = yes &&
 cat >>confdefs.h <<\EOF
@@ -26749,14 +26985,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:26752: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:26988: 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 26759 "configure"
+#line 26995 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -26768,16 +27004,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26771: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27007: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26774: \$? = $ac_status" >&5
+  echo "$as_me:27010: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26780: \$? = $ac_status" >&5
+  echo "$as_me:27016: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -26789,21 +27025,21 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:26792: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:27028: 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:26799: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:27035: 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 26806 "configure"
+#line 27042 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -26815,16 +27051,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26818: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27054: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26821: \$? = $ac_status" >&5
+  echo "$as_me:27057: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26827: \$? = $ac_status" >&5
+  echo "$as_me:27063: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -26836,7 +27072,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:26839: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:27075: 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
@@ -26845,13 +27081,13 @@ EOF
 
 fi
 
-echo "$as_me:26848: checking for uid_t in sys/types.h" >&5
+echo "$as_me:27084: 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 26854 "configure"
+#line 27090 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -26865,7 +27101,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:26868: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:27104: 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
 
@@ -26879,7 +27115,7 @@ EOF
 
 fi
 
-echo "$as_me:26882: checking type of array argument to getgroups" >&5
+echo "$as_me:27118: 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
@@ -26888,7 +27124,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26891 "configure"
+#line 27127 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -26914,15 +27150,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26917: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27153: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26920: \$? = $ac_status" >&5
+  echo "$as_me:27156: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27158: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26925: \$? = $ac_status" >&5
+  echo "$as_me:27161: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -26935,7 +27171,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 26938 "configure"
+#line 27174 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -26950,20 +27186,20 @@ rm -rf conftest*
 
 fi
 fi
-echo "$as_me:26953: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:27189: 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:26960: checking for off_t" >&5
+echo "$as_me:27196: 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 26966 "configure"
+#line 27202 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26978,16 +27214,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26981: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27217: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26984: \$? = $ac_status" >&5
+  echo "$as_me:27220: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27223: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26990: \$? = $ac_status" >&5
+  echo "$as_me:27226: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -26997,7 +27233,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27000: result: $ac_cv_type_off_t" >&5
+echo "$as_me:27236: 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
   :
@@ -27009,13 +27245,13 @@ EOF
 
 fi
 
-echo "$as_me:27012: checking for pid_t" >&5
+echo "$as_me:27248: 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 27018 "configure"
+#line 27254 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27030,16 +27266,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27033: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27269: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27036: \$? = $ac_status" >&5
+  echo "$as_me:27272: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27042: \$? = $ac_status" >&5
+  echo "$as_me:27278: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -27049,7 +27285,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27052: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:27288: 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
   :
@@ -27061,13 +27297,13 @@ EOF
 
 fi
 
-echo "$as_me:27064: checking for uid_t in sys/types.h" >&5
+echo "$as_me:27300: 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 27070 "configure"
+#line 27306 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -27081,7 +27317,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:27084: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:27320: 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
 
@@ -27095,13 +27331,13 @@ EOF
 
 fi
 
-echo "$as_me:27098: checking for mode_t" >&5
+echo "$as_me:27334: 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 27104 "configure"
+#line 27340 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27116,16 +27352,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27119: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27355: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27122: \$? = $ac_status" >&5
+  echo "$as_me:27358: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27128: \$? = $ac_status" >&5
+  echo "$as_me:27364: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -27135,7 +27371,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27138: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:27374: 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
   :
@@ -27147,13 +27383,13 @@ EOF
 
 fi
 
-	echo "$as_me:27150: checking for ssize_t" >&5
+	echo "$as_me:27386: 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 27156 "configure"
+#line 27392 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27168,16 +27404,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27171: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27407: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27174: \$? = $ac_status" >&5
+  echo "$as_me:27410: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27180: \$? = $ac_status" >&5
+  echo "$as_me:27416: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -27187,7 +27423,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27190: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:27426: 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
@@ -27203,13 +27439,13 @@ EOF
 
 fi
 
-	echo "$as_me:27206: checking for socklen_t" >&5
+	echo "$as_me:27442: 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 27212 "configure"
+#line 27448 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27227,16 +27463,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27230: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27466: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27233: \$? = $ac_status" >&5
+  echo "$as_me:27469: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27239: \$? = $ac_status" >&5
+  echo "$as_me:27475: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -27246,7 +27482,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27249: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:27485: 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
@@ -27262,7 +27498,7 @@ EOF
 
 fi
 
-echo "$as_me:27265: checking for long long type" >&5
+echo "$as_me:27501: 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
@@ -27293,7 +27529,7 @@ _CFEOF
 	rm -f conftest*
 
 fi
-echo "$as_me:27296: result: $cf_cv_type_long_long" >&5
+echo "$as_me:27532: 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
@@ -27304,14 +27540,14 @@ EOF
 
 fi
 
-echo "$as_me:27307: checking for tm.tm_gmtoff" >&5
+echo "$as_me:27543: 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 27314 "configure"
+#line 27550 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -27336,16 +27572,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27339: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27575: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27342: \$? = $ac_status" >&5
+  echo "$as_me:27578: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27345: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27348: \$? = $ac_status" >&5
+  echo "$as_me:27584: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -27356,20 +27592,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:27359: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:27595: 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:27366: checking for int" >&5
+echo "$as_me:27602: 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 27372 "configure"
+#line 27608 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27384,16 +27620,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27387: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27623: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27390: \$? = $ac_status" >&5
+  echo "$as_me:27626: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27393: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27396: \$? = $ac_status" >&5
+  echo "$as_me:27632: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -27403,10 +27639,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27406: result: $ac_cv_type_int" >&5
+echo "$as_me:27642: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:27409: checking size of int" >&5
+echo "$as_me:27645: 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
@@ -27415,7 +27651,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 27418 "configure"
+#line 27654 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27427,21 +27663,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27430: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27666: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27433: \$? = $ac_status" >&5
+  echo "$as_me:27669: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27436: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27672: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27439: \$? = $ac_status" >&5
+  echo "$as_me:27675: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27444 "configure"
+#line 27680 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27453,16 +27689,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27456: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27692: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27459: \$? = $ac_status" >&5
+  echo "$as_me:27695: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27698: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27465: \$? = $ac_status" >&5
+  echo "$as_me:27701: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27478,7 +27714,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27481 "configure"
+#line 27717 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27490,16 +27726,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27493: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27729: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27496: \$? = $ac_status" >&5
+  echo "$as_me:27732: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27499: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27735: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27502: \$? = $ac_status" >&5
+  echo "$as_me:27738: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27515,7 +27751,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 27518 "configure"
+#line 27754 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27527,16 +27763,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27530: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27766: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27533: \$? = $ac_status" >&5
+  echo "$as_me:27769: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27772: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27539: \$? = $ac_status" >&5
+  echo "$as_me:27775: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -27549,12 +27785,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27552: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27788: 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 27557 "configure"
+#line 27793 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27570,15 +27806,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27573: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27809: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27576: \$? = $ac_status" >&5
+  echo "$as_me:27812: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27581: \$? = $ac_status" >&5
+  echo "$as_me:27817: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -27594,7 +27830,7 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:27597: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:27833: 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
@@ -27602,23 +27838,23 @@ EOF
 
 if test "${ac_cv_type_int:+set}" = set; then
 	if test "${ac_cv_sizeof_int:+set}" != set; then
-		{ echo "$as_me:27605: WARNING: using 4 for sizeof int" >&5
+		{ echo "$as_me:27841: 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:27609: WARNING: sizeof int not found, using 4" >&5
+		{ echo "$as_me:27845: 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:27615: checking for long" >&5
+echo "$as_me:27851: 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 27621 "configure"
+#line 27857 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27633,16 +27869,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27636: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27872: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27639: \$? = $ac_status" >&5
+  echo "$as_me:27875: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27642: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27878: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27645: \$? = $ac_status" >&5
+  echo "$as_me:27881: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -27652,10 +27888,10 @@ ac_cv_type_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27655: result: $ac_cv_type_long" >&5
+echo "$as_me:27891: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:27658: checking size of long" >&5
+echo "$as_me:27894: 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
@@ -27664,7 +27900,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 27667 "configure"
+#line 27903 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27676,21 +27912,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27679: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27915: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27682: \$? = $ac_status" >&5
+  echo "$as_me:27918: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27688: \$? = $ac_status" >&5
+  echo "$as_me:27924: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27693 "configure"
+#line 27929 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27702,16 +27938,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27705: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27941: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27708: \$? = $ac_status" >&5
+  echo "$as_me:27944: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27714: \$? = $ac_status" >&5
+  echo "$as_me:27950: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27727,7 +27963,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27730 "configure"
+#line 27966 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27739,16 +27975,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27742: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27978: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27745: \$? = $ac_status" >&5
+  echo "$as_me:27981: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27751: \$? = $ac_status" >&5
+  echo "$as_me:27987: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27764,7 +28000,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 27767 "configure"
+#line 28003 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27776,16 +28012,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27779: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28015: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27782: \$? = $ac_status" >&5
+  echo "$as_me:28018: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27785: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28021: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27788: \$? = $ac_status" >&5
+  echo "$as_me:28024: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -27798,12 +28034,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27801: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28037: 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 27806 "configure"
+#line 28042 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27819,15 +28055,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27822: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27825: \$? = $ac_status" >&5
+  echo "$as_me:28061: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27830: \$? = $ac_status" >&5
+  echo "$as_me:28066: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -27843,7 +28079,7 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:27846: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:28082: 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
@@ -27851,23 +28087,23 @@ EOF
 
 if test "${ac_cv_type_long:+set}" = set; then
 	if test "${ac_cv_sizeof_long:+set}" != set; then
-		{ echo "$as_me:27854: WARNING: using 4 for sizeof long" >&5
+		{ echo "$as_me:28090: 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:27858: WARNING: sizeof long not found, using 4" >&5
+		{ echo "$as_me:28094: 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:27864: checking for off_t" >&5
+echo "$as_me:28100: 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 27870 "configure"
+#line 28106 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27882,16 +28118,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27885: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28121: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27888: \$? = $ac_status" >&5
+  echo "$as_me:28124: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27894: \$? = $ac_status" >&5
+  echo "$as_me:28130: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -27901,10 +28137,10 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27904: result: $ac_cv_type_off_t" >&5
+echo "$as_me:28140: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:27907: checking size of off_t" >&5
+echo "$as_me:28143: 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
@@ -27913,7 +28149,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 27916 "configure"
+#line 28152 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27925,21 +28161,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27928: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28164: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27931: \$? = $ac_status" >&5
+  echo "$as_me:28167: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27937: \$? = $ac_status" >&5
+  echo "$as_me:28173: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27942 "configure"
+#line 28178 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27951,16 +28187,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27954: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28190: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27957: \$? = $ac_status" >&5
+  echo "$as_me:28193: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28196: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27963: \$? = $ac_status" >&5
+  echo "$as_me:28199: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27976,7 +28212,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27979 "configure"
+#line 28215 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27988,16 +28224,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27991: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28227: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27994: \$? = $ac_status" >&5
+  echo "$as_me:28230: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28000: \$? = $ac_status" >&5
+  echo "$as_me:28236: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28013,7 +28249,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 28016 "configure"
+#line 28252 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28025,16 +28261,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28028: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28264: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28031: \$? = $ac_status" >&5
+  echo "$as_me:28267: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28037: \$? = $ac_status" >&5
+  echo "$as_me:28273: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28047,12 +28283,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28050: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28286: 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 28055 "configure"
+#line 28291 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28068,15 +28304,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28307: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28074: \$? = $ac_status" >&5
+  echo "$as_me:28310: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28079: \$? = $ac_status" >&5
+  echo "$as_me:28315: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -28092,7 +28328,7 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:28095: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:28331: 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
@@ -28100,23 +28336,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:28103: WARNING: using 4 for sizeof off_t" >&5
+		{ echo "$as_me:28339: 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:28107: WARNING: sizeof off_t not found, using 4" >&5
+		{ echo "$as_me:28343: 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:28113: checking for time_t" >&5
+echo "$as_me:28349: 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 28119 "configure"
+#line 28355 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28131,16 +28367,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28134: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28370: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28137: \$? = $ac_status" >&5
+  echo "$as_me:28373: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28143: \$? = $ac_status" >&5
+  echo "$as_me:28379: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -28150,10 +28386,10 @@ ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28153: result: $ac_cv_type_time_t" >&5
+echo "$as_me:28389: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:28156: checking size of time_t" >&5
+echo "$as_me:28392: 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
@@ -28162,7 +28398,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28165 "configure"
+#line 28401 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28174,21 +28410,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28177: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28413: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28180: \$? = $ac_status" >&5
+  echo "$as_me:28416: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28183: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28419: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28186: \$? = $ac_status" >&5
+  echo "$as_me:28422: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28191 "configure"
+#line 28427 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28200,16 +28436,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28203: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28439: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28206: \$? = $ac_status" >&5
+  echo "$as_me:28442: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28212: \$? = $ac_status" >&5
+  echo "$as_me:28448: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28225,7 +28461,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28228 "configure"
+#line 28464 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28237,16 +28473,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28240: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28476: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28243: \$? = $ac_status" >&5
+  echo "$as_me:28479: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28249: \$? = $ac_status" >&5
+  echo "$as_me:28485: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28262,7 +28498,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 28265 "configure"
+#line 28501 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28274,16 +28510,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28277: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28513: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28280: \$? = $ac_status" >&5
+  echo "$as_me:28516: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28286: \$? = $ac_status" >&5
+  echo "$as_me:28522: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28296,12 +28532,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28299: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28535: 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 28304 "configure"
+#line 28540 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28317,15 +28553,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28320: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28556: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28323: \$? = $ac_status" >&5
+  echo "$as_me:28559: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28328: \$? = $ac_status" >&5
+  echo "$as_me:28564: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -28341,7 +28577,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:28344: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:28580: 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
@@ -28349,23 +28585,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:28352: WARNING: using 4 for sizeof time_t" >&5
+		{ echo "$as_me:28588: 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:28356: WARNING: sizeof time_t not found, using 4" >&5
+		{ echo "$as_me:28592: 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:28362: checking for intptr_t" >&5
+echo "$as_me:28598: 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 28368 "configure"
+#line 28604 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28380,16 +28616,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28383: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28619: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28386: \$? = $ac_status" >&5
+  echo "$as_me:28622: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28389: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28392: \$? = $ac_status" >&5
+  echo "$as_me:28628: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -28399,7 +28635,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28402: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:28638: 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
   :
@@ -28413,13 +28649,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:28416: checking for working alloca.h" >&5
+echo "$as_me:28652: 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 28422 "configure"
+#line 28658 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -28431,16 +28667,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28434: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28670: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28437: \$? = $ac_status" >&5
+  echo "$as_me:28673: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28443: \$? = $ac_status" >&5
+  echo "$as_me:28679: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -28450,7 +28686,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28453: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:28689: 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
 
@@ -28460,13 +28696,13 @@ EOF
 
 fi
 
-echo "$as_me:28463: checking for alloca" >&5
+echo "$as_me:28699: 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 28469 "configure"
+#line 28705 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -28498,16 +28734,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28501: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28737: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28504: \$? = $ac_status" >&5
+  echo "$as_me:28740: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28510: \$? = $ac_status" >&5
+  echo "$as_me:28746: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -28517,7 +28753,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28520: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:28756: 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
@@ -28538,13 +28774,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:28541: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:28777: 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 28547 "configure"
+#line 28783 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -28562,18 +28798,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:28565: result: $ac_cv_os_cray" >&5
+echo "$as_me:28801: 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:28570: checking for $ac_func" >&5
+echo "$as_me:28806: 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 28576 "configure"
+#line 28812 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -28604,16 +28840,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:28607: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28843: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28610: \$? = $ac_status" >&5
+  echo "$as_me:28846: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28616: \$? = $ac_status" >&5
+  echo "$as_me:28852: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -28623,7 +28859,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28626: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:28862: 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
 
@@ -28637,7 +28873,7 @@ fi
   done
 fi
 
-echo "$as_me:28640: checking stack direction for C alloca" >&5
+echo "$as_me:28876: 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
@@ -28646,7 +28882,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28649 "configure"
+#line 28885 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -28669,15 +28905,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28672: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28908: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28675: \$? = $ac_status" >&5
+  echo "$as_me:28911: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28677: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28913: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28680: \$? = $ac_status" >&5
+  echo "$as_me:28916: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -28689,7 +28925,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:28692: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:28928: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -28701,23 +28937,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:28704: checking for $ac_header" >&5
+echo "$as_me:28940: 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 28710 "configure"
+#line 28946 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:28714: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:28950: \"$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:28720: \$? = $ac_status" >&5
+  echo "$as_me:28956: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -28736,7 +28972,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:28739: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:28975: 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
@@ -28749,13 +28985,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:28752: checking for $ac_func" >&5
+echo "$as_me:28988: 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 28758 "configure"
+#line 28994 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -28786,16 +29022,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:28789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29025: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28792: \$? = $ac_status" >&5
+  echo "$as_me:29028: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28798: \$? = $ac_status" >&5
+  echo "$as_me:29034: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -28805,7 +29041,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28808: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29044: 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
@@ -28817,7 +29053,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:28820: checking for working fork" >&5
+  echo "$as_me:29056: 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
@@ -28840,15 +29076,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28843: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29079: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28846: \$? = $ac_status" >&5
+  echo "$as_me:29082: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28851: \$? = $ac_status" >&5
+  echo "$as_me:29087: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -28860,7 +29096,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:28863: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:29099: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -28874,12 +29110,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:28877: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:29113: 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:28882: checking for working vfork" >&5
+  echo "$as_me:29118: 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
@@ -28888,7 +29124,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28891 "configure"
+#line 29127 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -28985,15 +29221,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28988: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28991: \$? = $ac_status" >&5
+  echo "$as_me:29227: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28996: \$? = $ac_status" >&5
+  echo "$as_me:29232: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -29005,13 +29241,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:29008: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:29244: 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:29014: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:29250: 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
 
@@ -29036,14 +29272,14 @@ EOF
 
 fi
 
-echo "$as_me:29039: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:29275: 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 29046 "configure"
+#line 29282 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29060,16 +29296,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29063: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29299: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29066: \$? = $ac_status" >&5
+  echo "$as_me:29302: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29305: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29072: \$? = $ac_status" >&5
+  echo "$as_me:29308: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -29077,7 +29313,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29080 "configure"
+#line 29316 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29099,16 +29335,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29102: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29338: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29105: \$? = $ac_status" >&5
+  echo "$as_me:29341: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29111: \$? = $ac_status" >&5
+  echo "$as_me:29347: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -29121,21 +29357,21 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29124: result: $cf_cv_fionbio" >&5
+echo "$as_me:29360: 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:29131: checking for broken/missing definition of remove" >&5
+echo "$as_me:29367: 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 29138 "configure"
+#line 29374 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29147,23 +29383,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29150: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29386: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29153: \$? = $ac_status" >&5
+  echo "$as_me:29389: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29159: \$? = $ac_status" >&5
+  echo "$as_me:29395: \$? = $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 29166 "configure"
+#line 29402 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -29176,16 +29412,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29179: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29415: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29182: \$? = $ac_status" >&5
+  echo "$as_me:29418: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29188: \$? = $ac_status" >&5
+  echo "$as_me:29424: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -29200,21 +29436,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:29203: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:29439: 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:29210: checking for lstat" >&5
+echo "$as_me:29446: 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 29217 "configure"
+#line 29453 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29228,16 +29464,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29231: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29467: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29234: \$? = $ac_status" >&5
+  echo "$as_me:29470: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29237: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29240: \$? = $ac_status" >&5
+  echo "$as_me:29476: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -29249,7 +29485,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:29252: result: $ac_cv_func_lstat " >&5
+echo "$as_me:29488: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test $ac_cv_func_lstat = yes; then
 
@@ -29284,13 +29520,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29287: checking for $ac_func" >&5
+echo "$as_me:29523: 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 29293 "configure"
+#line 29529 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29321,16 +29557,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:29324: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29560: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29327: \$? = $ac_status" >&5
+  echo "$as_me:29563: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29333: \$? = $ac_status" >&5
+  echo "$as_me:29569: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29340,7 +29576,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29343: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29579: 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
@@ -29356,13 +29592,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29359: checking for $ac_func" >&5
+echo "$as_me:29595: 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 29365 "configure"
+#line 29601 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29393,16 +29629,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:29396: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29632: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29399: \$? = $ac_status" >&5
+  echo "$as_me:29635: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29638: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29405: \$? = $ac_status" >&5
+  echo "$as_me:29641: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29412,7 +29648,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29415: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29651: 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
@@ -29424,7 +29660,7 @@ else
 fi
 done
 
-echo "$as_me:29427: checking for random-integer functions" >&5
+echo "$as_me:29663: 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
@@ -29444,7 +29680,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29447 "configure"
+#line 29683 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -29463,16 +29699,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:29466: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29702: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29469: \$? = $ac_status" >&5
+  echo "$as_me:29705: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29475: \$? = $ac_status" >&5
+  echo "$as_me:29711: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -29484,10 +29720,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:29487: result: $cf_cv_srand_func" >&5
+echo "$as_me:29723: 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:29490: checking for range of random-integers" >&5
+	echo "$as_me:29726: 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
@@ -29508,7 +29744,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 29511 "configure"
+#line 29747 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -29527,16 +29763,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29530: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29766: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29533: \$? = $ac_status" >&5
+  echo "$as_me:29769: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29772: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29539: \$? = $ac_status" >&5
+  echo "$as_me:29775: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29547,15 +29783,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:29550: result: $cf_cv_rand_max" >&5
+echo "$as_me:29786: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	case $cf_cv_srand_func in
 	(*/arc4random)
-		echo "$as_me:29555: checking if <bsd/stdlib.h> should be included" >&5
+		echo "$as_me:29791: 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 29558 "configure"
+#line 29794 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -29568,23 +29804,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29571: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29807: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29574: \$? = $ac_status" >&5
+  echo "$as_me:29810: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29813: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29580: \$? = $ac_status" >&5
+  echo "$as_me:29816: \$? = $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 29587 "configure"
+#line 29823 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -29596,16 +29832,16 @@ unsigned x = arc4random()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29599: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29835: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29602: \$? = $ac_status" >&5
+  echo "$as_me:29838: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29608: \$? = $ac_status" >&5
+  echo "$as_me:29844: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_stdlib_h=yes
 else
@@ -29616,7 +29852,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	    echo "$as_me:29619: result: $cf_bsd_stdlib_h" >&5
+	    echo "$as_me:29855: result: $cf_bsd_stdlib_h" >&5
 echo "${ECHO_T}$cf_bsd_stdlib_h" >&6
 		if test "$cf_bsd_stdlib_h" = yes
 		then
@@ -29626,10 +29862,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 		else
-			echo "$as_me:29629: checking if <bsd/random.h> should be included" >&5
+			echo "$as_me:29865: 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 29632 "configure"
+#line 29868 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -29642,23 +29878,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29645: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29881: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29648: \$? = $ac_status" >&5
+  echo "$as_me:29884: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29654: \$? = $ac_status" >&5
+  echo "$as_me:29890: \$? = $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 29661 "configure"
+#line 29897 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -29670,16 +29906,16 @@ unsigned x = arc4random()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29673: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29909: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29676: \$? = $ac_status" >&5
+  echo "$as_me:29912: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29915: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29682: \$? = $ac_status" >&5
+  echo "$as_me:29918: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_random_h=yes
 else
@@ -29690,7 +29926,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-			echo "$as_me:29693: result: $cf_bsd_random_h" >&5
+			echo "$as_me:29929: result: $cf_bsd_random_h" >&5
 echo "${ECHO_T}$cf_bsd_random_h" >&6
 			if test "$cf_bsd_random_h" = yes
 			then
@@ -29700,7 +29936,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 			else
-				{ echo "$as_me:29703: WARNING: no header file found for arc4random" >&5
+				{ echo "$as_me:29939: WARNING: no header file found for arc4random" >&5
 echo "$as_me: WARNING: no header file found for arc4random" >&2;}
 			fi
 		fi
@@ -29735,13 +29971,13 @@ fi
 for ac_func in sleep
 do
 
-echo "$as_me:29738: checking for $ac_func declaration" >&5
+echo "$as_me:29974: 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 29744 "configure"
+#line 29980 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -29762,20 +29998,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29765: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30001: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29768: \$? = $ac_status" >&5
+  echo "$as_me:30004: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30007: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29774: \$? = $ac_status" >&5
+  echo "$as_me:30010: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29778 "configure"
+#line 30014 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -29796,16 +30032,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29799: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30035: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29802: \$? = $ac_status" >&5
+  echo "$as_me:30038: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29808: \$? = $ac_status" >&5
+  echo "$as_me:30044: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -29826,11 +30062,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:29829: result: yes" >&5
+  echo "$as_me:30065: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:29833: result: no" >&5
+  echo "$as_me:30069: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -29845,13 +30081,13 @@ done
 for ac_func in strstr
 do
 
-echo "$as_me:29848: checking for $ac_func declaration" >&5
+echo "$as_me:30084: 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 29854 "configure"
+#line 30090 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -29865,20 +30101,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29868: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30104: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29871: \$? = $ac_status" >&5
+  echo "$as_me:30107: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29877: \$? = $ac_status" >&5
+  echo "$as_me:30113: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29881 "configure"
+#line 30117 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -29892,16 +30128,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29895: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30131: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29898: \$? = $ac_status" >&5
+  echo "$as_me:30134: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29901: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30137: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29904: \$? = $ac_status" >&5
+  echo "$as_me:30140: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -29922,11 +30158,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:29925: result: yes" >&5
+  echo "$as_me:30161: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:29929: result: no" >&5
+  echo "$as_me:30165: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -29941,13 +30177,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:29944: checking for $ac_func declaration" >&5
+echo "$as_me:30180: 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 29950 "configure"
+#line 30186 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -29963,20 +30199,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29966: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30202: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29969: \$? = $ac_status" >&5
+  echo "$as_me:30205: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29975: \$? = $ac_status" >&5
+  echo "$as_me:30211: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29979 "configure"
+#line 30215 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -29992,16 +30228,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29995: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30231: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29998: \$? = $ac_status" >&5
+  echo "$as_me:30234: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30004: \$? = $ac_status" >&5
+  echo "$as_me:30240: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30022,11 +30258,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:30025: result: yes" >&5
+  echo "$as_me:30261: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30029: result: no" >&5
+  echo "$as_me:30265: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30038,14 +30274,14 @@ EOF
 fi
 done
 
-echo "$as_me:30041: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:30277: 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 30048 "configure"
+#line 30284 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -30059,16 +30295,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30062: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30298: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30065: \$? = $ac_status" >&5
+  echo "$as_me:30301: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30071: \$? = $ac_status" >&5
+  echo "$as_me:30307: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -30079,7 +30315,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:30082: result: $cf_cv_bool_defs" >&5
+echo "$as_me:30318: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 
@@ -30093,14 +30329,14 @@ EOF
 
 fi
 
-echo "$as_me:30096: checking if external errno is declared" >&5
+echo "$as_me:30332: 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 30103 "configure"
+	cat >conftest.$ac_ext <<_ACEOF
+#line 30339 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30118,16 +30354,16 @@ int x = (int) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30121: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30357: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30124: \$? = $ac_status" >&5
+  echo "$as_me:30360: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30130: \$? = $ac_status" >&5
+  echo "$as_me:30366: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -30138,14 +30374,14 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30141: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:30377: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
 
 cf_result=`echo "decl_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-    cat >>confdefs.h <<EOF
+	cat >>confdefs.h <<EOF
 #define $cf_result 1
 EOF
 
@@ -30153,14 +30389,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30156: checking if external errno exists" >&5
+echo "$as_me:30392: 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 30163 "configure"
+	cat >conftest.$ac_ext <<_ACEOF
+#line 30399 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -30175,16 +30411,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30414: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30181: \$? = $ac_status" >&5
+  echo "$as_me:30417: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30420: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30187: \$? = $ac_status" >&5
+  echo "$as_me:30423: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -30195,20 +30431,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30198: result: $cf_cv_have_errno" >&5
+echo "$as_me:30434: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
 
 cf_result=`echo "have_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-    cat >>confdefs.h <<EOF
+	cat >>confdefs.h <<EOF
 #define $cf_result 1
 EOF
 
 fi
 
-echo "$as_me:30211: checking if we can set errno" >&5
+echo "$as_me:30447: 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
@@ -30216,7 +30452,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 30219 "configure"
+#line 30455 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -30228,16 +30464,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30231: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30467: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30234: \$? = $ac_status" >&5
+  echo "$as_me:30470: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30237: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30240: \$? = $ac_status" >&5
+  echo "$as_me:30476: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -30248,7 +30484,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 30251 "configure"
+#line 30487 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -30259,15 +30495,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:30262: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30498: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30265: \$? = $ac_status" >&5
+  echo "$as_me:30501: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:30267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30503: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30270: \$? = $ac_status" >&5
+  echo "$as_me:30506: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -30280,21 +30516,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:30283: result: $cf_cv_set_errno" >&5
+echo "$as_me:30519: 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:30290: checking for setlocale()" >&5
+echo "$as_me:30526: 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 30297 "configure"
+#line 30533 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -30306,16 +30542,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30309: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30545: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30312: \$? = $ac_status" >&5
+  echo "$as_me:30548: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30318: \$? = $ac_status" >&5
+  echo "$as_me:30554: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -30327,7 +30563,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:30330: result: $cf_cv_locale" >&5
+echo "$as_me:30566: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && {
 cat >>confdefs.h <<\EOF
@@ -30335,14 +30571,14 @@ cat >>confdefs.h <<\EOF
 EOF
  }
 
-echo "$as_me:30338: checking if NGROUPS is defined" >&5
+echo "$as_me:30574: 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 30345 "configure"
+#line 30581 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -30361,23 +30597,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30364: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30600: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30367: \$? = $ac_status" >&5
+  echo "$as_me:30603: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30373: \$? = $ac_status" >&5
+  echo "$as_me:30609: \$? = $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 30380 "configure"
+#line 30616 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -30396,16 +30632,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30399: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30635: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30402: \$? = $ac_status" >&5
+  echo "$as_me:30638: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30405: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30641: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30408: \$? = $ac_status" >&5
+  echo "$as_me:30644: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -30417,7 +30653,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:30420: result: $cf_cv_ngroups" >&5
+echo "$as_me:30656: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -30435,14 +30671,14 @@ EOF
 
 fi
 
-echo "$as_me:30438: checking if external sys_nerr is declared" >&5
+echo "$as_me:30674: 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 30445 "configure"
+	cat >conftest.$ac_ext <<_ACEOF
+#line 30681 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30460,16 +30696,16 @@ int x = (int) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30463: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30699: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30466: \$? = $ac_status" >&5
+  echo "$as_me:30702: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30472: \$? = $ac_status" >&5
+  echo "$as_me:30708: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -30480,14 +30716,14 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30483: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:30719: 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
 
 cf_result=`echo "decl_sys_nerr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-    cat >>confdefs.h <<EOF
+	cat >>confdefs.h <<EOF
 #define $cf_result 1
 EOF
 
@@ -30495,14 +30731,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30498: checking if external sys_nerr exists" >&5
+echo "$as_me:30734: 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 30505 "configure"
+	cat >conftest.$ac_ext <<_ACEOF
+#line 30741 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -30517,16 +30753,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30520: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30756: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30523: \$? = $ac_status" >&5
+  echo "$as_me:30759: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30526: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30762: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30529: \$? = $ac_status" >&5
+  echo "$as_me:30765: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -30537,27 +30773,27 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30540: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:30776: 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
 
 cf_result=`echo "have_sys_nerr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-    cat >>confdefs.h <<EOF
+	cat >>confdefs.h <<EOF
 #define $cf_result 1
 EOF
 
 fi
 
-echo "$as_me:30553: checking if external sys_errlist is declared" >&5
+echo "$as_me:30789: 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 30560 "configure"
+	cat >conftest.$ac_ext <<_ACEOF
+#line 30796 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30575,16 +30811,16 @@ int x = (int) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30578: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30814: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30581: \$? = $ac_status" >&5
+  echo "$as_me:30817: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30587: \$? = $ac_status" >&5
+  echo "$as_me:30823: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -30595,14 +30831,14 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30598: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:30834: 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
 
 cf_result=`echo "decl_sys_errlist" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-    cat >>confdefs.h <<EOF
+	cat >>confdefs.h <<EOF
 #define $cf_result 1
 EOF
 
@@ -30610,14 +30846,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30613: checking if external sys_errlist exists" >&5
+echo "$as_me:30849: 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 30620 "configure"
+	cat >conftest.$ac_ext <<_ACEOF
+#line 30856 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -30632,16 +30868,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30635: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30871: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30638: \$? = $ac_status" >&5
+  echo "$as_me:30874: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30877: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30644: \$? = $ac_status" >&5
+  echo "$as_me:30880: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -30652,14 +30888,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30655: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:30891: 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
 
 cf_result=`echo "have_sys_errlist" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-    cat >>confdefs.h <<EOF
+	cat >>confdefs.h <<EOF
 #define $cf_result 1
 EOF
 
@@ -30668,23 +30904,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:30671: checking for $ac_header" >&5
+echo "$as_me:30907: 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 30677 "configure"
+#line 30913 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:30681: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:30917: \"$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:30687: \$? = $ac_status" >&5
+  echo "$as_me:30923: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -30703,7 +30939,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:30706: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:30942: 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
@@ -30713,14 +30949,14 @@ EOF
 fi
 done
 
-echo "$as_me:30716: checking for lastlog path" >&5
+echo "$as_me:30952: 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 30723 "configure"
+#line 30959 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30740,16 +30976,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30743: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30979: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30746: \$? = $ac_status" >&5
+  echo "$as_me:30982: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30752: \$? = $ac_status" >&5
+  echo "$as_me:30988: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -30764,14 +31000,14 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30767: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:31003: 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:30774: checking for utmp implementation" >&5
+echo "$as_me:31010: 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
@@ -30788,7 +31024,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 30791 "configure"
+#line 31027 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -30802,16 +31038,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30805: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31041: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30808: \$? = $ac_status" >&5
+  echo "$as_me:31044: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31047: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30814: \$? = $ac_status" >&5
+  echo "$as_me:31050: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -30820,7 +31056,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 30823 "configure"
+#line 31059 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -30834,16 +31070,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31073: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30840: \$? = $ac_status" >&5
+  echo "$as_me:31076: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30846: \$? = $ac_status" >&5
+  echo "$as_me:31082: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -30858,7 +31094,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:30861: result: $cf_cv_have_utmp" >&5
+echo "$as_me:31097: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -30873,14 +31109,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:30876: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:31112: 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 30883 "configure"
+#line 31119 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30894,16 +31130,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30897: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31133: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30900: \$? = $ac_status" >&5
+  echo "$as_me:31136: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30906: \$? = $ac_status" >&5
+  echo "$as_me:31142: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -30915,7 +31151,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:30918: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:31154: 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
@@ -30925,14 +31161,14 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:30928: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:31164: 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 30935 "configure"
+#line 31171 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30946,16 +31182,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30949: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31185: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30952: \$? = $ac_status" >&5
+  echo "$as_me:31188: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30955: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31191: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30958: \$? = $ac_status" >&5
+  echo "$as_me:31194: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -30967,7 +31203,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:30970: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:31206: 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
@@ -30977,7 +31213,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:30980: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:31216: 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
@@ -30994,7 +31230,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 30997 "configure"
+#line 31233 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -31008,16 +31244,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31011: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31247: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31014: \$? = $ac_status" >&5
+  echo "$as_me:31250: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31253: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31020: \$? = $ac_status" >&5
+  echo "$as_me:31256: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -31029,12 +31265,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31032: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:31268: 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
 (no)
-	{ { echo "$as_me:31037: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:31273: 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; }; }
 	;;
@@ -31049,7 +31285,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31052: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:31288: 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
@@ -31062,7 +31298,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 31065 "configure"
+#line 31301 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31076,16 +31312,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31079: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31315: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31082: \$? = $ac_status" >&5
+  echo "$as_me:31318: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31088: \$? = $ac_status" >&5
+  echo "$as_me:31324: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -31098,7 +31334,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31101: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:31337: 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
 
@@ -31114,14 +31350,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31117: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:31353: 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 31124 "configure"
+#line 31360 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31135,23 +31371,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31138: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31374: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31141: \$? = $ac_status" >&5
+  echo "$as_me:31377: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31144: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31147: \$? = $ac_status" >&5
+  echo "$as_me:31383: \$? = $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 31154 "configure"
+#line 31390 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31165,16 +31401,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:31168: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31404: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31171: \$? = $ac_status" >&5
+  echo "$as_me:31407: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31410: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31177: \$? = $ac_status" >&5
+  echo "$as_me:31413: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -31188,7 +31424,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31191: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:31427: 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
 
@@ -31207,14 +31443,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31210: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:31446: 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 31217 "configure"
+#line 31453 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31228,16 +31464,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31231: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31467: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31234: \$? = $ac_status" >&5
+  echo "$as_me:31470: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31237: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31240: \$? = $ac_status" >&5
+  echo "$as_me:31476: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -31248,7 +31484,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31251: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:31487: 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
 
@@ -31259,7 +31495,7 @@ EOF
 fi
 fi
 
-echo "$as_me:31262: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:31498: 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
@@ -31267,7 +31503,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31270 "configure"
+#line 31506 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31286,16 +31522,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31289: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31525: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31292: \$? = $ac_status" >&5
+  echo "$as_me:31528: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31295: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31298: \$? = $ac_status" >&5
+  echo "$as_me:31534: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -31306,7 +31542,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31309: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:31545: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test $cf_cv_sysv_utmp = yes &&
 cat >>confdefs.h <<\EOF
@@ -31315,14 +31551,14 @@ EOF
 
 fi
 
-echo "$as_me:31318: checking if external h_errno exists" >&5
+echo "$as_me:31554: 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 31325 "configure"
+	cat >conftest.$ac_ext <<_ACEOF
+#line 31561 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -31337,16 +31573,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31340: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31576: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31343: \$? = $ac_status" >&5
+  echo "$as_me:31579: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31349: \$? = $ac_status" >&5
+  echo "$as_me:31585: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -31357,20 +31593,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31360: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:31596: 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
 
 cf_result=`echo "have_h_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-    cat >>confdefs.h <<EOF
+	cat >>confdefs.h <<EOF
 #define $cf_result 1
 EOF
 
 fi
 
-echo "$as_me:31373: checking if bibp: URLs should be supported" >&5
+echo "$as_me:31609: 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.
@@ -31387,14 +31623,14 @@ else
   use_bibp_urls=yes
 
 fi;
-echo "$as_me:31390: result: $use_bibp_urls" >&5
+echo "$as_me:31626: 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:31397: checking if configuration info should be browsable" >&5
+echo "$as_me:31633: 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.
@@ -31411,14 +31647,14 @@ else
   use_config_info=yes
 
 fi;
-echo "$as_me:31414: result: $use_config_info" >&5
+echo "$as_me:31650: 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:31421: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:31657: 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.
@@ -31435,14 +31671,14 @@ else
   use_forms_options=yes
 
 fi;
-echo "$as_me:31438: result: $use_forms_options" >&5
+echo "$as_me:31674: 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:31445: checking if old-style options menu should be used" >&5
+echo "$as_me:31681: 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.
@@ -31459,14 +31695,14 @@ else
   use_menu_options=yes
 
 fi;
-echo "$as_me:31462: result: $use_menu_options" >&5
+echo "$as_me:31698: 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:31469: checking if sessions code should be used" >&5
+echo "$as_me:31705: 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.
@@ -31483,7 +31719,7 @@ else
   use_sessions=yes
 
 fi;
-echo "$as_me:31486: result: $use_sessions" >&5
+echo "$as_me:31722: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
 
@@ -31494,7 +31730,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:31497: checking if session-caching code should be used" >&5
+echo "$as_me:31733: 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.
@@ -31511,7 +31747,7 @@ else
   use_session_cache=yes
 
 fi;
-echo "$as_me:31514: result: $use_session_cache" >&5
+echo "$as_me:31750: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
 
@@ -31521,7 +31757,7 @@ EOF
 
 fi
 
-echo "$as_me:31524: checking if address-list page should be used" >&5
+echo "$as_me:31760: 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.
@@ -31538,14 +31774,14 @@ else
   use_addrlist_page=yes
 
 fi;
-echo "$as_me:31541: result: $use_addrlist_page" >&5
+echo "$as_me:31777: 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:31548: checking if experimental CJK logic should be used" >&5
+echo "$as_me:31784: 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.
@@ -31562,14 +31798,14 @@ else
   use_cjk=no
 
 fi;
-echo "$as_me:31565: result: $use_cjk" >&5
+echo "$as_me:31801: 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:31572: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:31808: 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.
@@ -31586,7 +31822,7 @@ else
   use_ja_utf8=no
 
 fi;
-echo "$as_me:31589: result: $use_ja_utf8" >&5
+echo "$as_me:31825: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 
@@ -31632,7 +31868,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 31635 "configure"
+#line 31871 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31644,16 +31880,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31647: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31883: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31650: \$? = $ac_status" >&5
+  echo "$as_me:31886: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31656: \$? = $ac_status" >&5
+  echo "$as_me:31892: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31670,7 +31906,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}:31673: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31909: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -31711,7 +31947,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 31714 "configure"
+#line 31950 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31723,16 +31959,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31726: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31962: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31729: \$? = $ac_status" >&5
+  echo "$as_me:31965: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31735: \$? = $ac_status" >&5
+  echo "$as_me:31971: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31749,7 +31985,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}:31752: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31988: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -31765,70 +32001,70 @@ echo "${as_me:-configure}:31752: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:31768: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:32004: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 	if test -d $cf_searchpath/lib; then
 
 if test -n "$cf_searchpath/lib" ; then
-  for cf_add_libdir in $cf_searchpath/lib
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath/lib
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:31793: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32029: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	elif test -d $cf_searchpath ; then
 
 if test -n "$cf_searchpath" ; then
-  for cf_add_libdir in $cf_searchpath
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:31822: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32058: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	else
-{ { echo "$as_me:31831: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:32067: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -31839,7 +32075,7 @@ done
 
 fi;
 
-  echo "$as_me:31842: checking for iconv" >&5
+  echo "$as_me:32078: 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
@@ -31850,12 +32086,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:31853: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32089: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 31858 "configure"
+#line 32094 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -31874,16 +32110,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31877: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32113: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31880: \$? = $ac_status" >&5
+  echo "$as_me:32116: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32119: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31886: \$? = $ac_status" >&5
+  echo "$as_me:32122: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -31897,7 +32133,7 @@ cat conftest.$ac_ext >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 31900 "configure"
+#line 32136 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -31916,16 +32152,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31919: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32155: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31922: \$? = $ac_status" >&5
+  echo "$as_me:32158: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31928: \$? = $ac_status" >&5
+  echo "$as_me:32164: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -31940,14 +32176,14 @@ cat conftest.$ac_ext >&5
 	cf_cv_find_linkage_iconv=no
 	LIBS="$cf_save_LIBS"
 
-    test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
+	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:31945: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:32181: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:31947: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32183: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
-    cf_save_CPPFLAGS="$CPPFLAGS"
-    cf_test_CPPFLAGS="$CPPFLAGS"
+	cf_save_CPPFLAGS="$CPPFLAGS"
+	cf_test_CPPFLAGS="$CPPFLAGS"
 
 cf_search=
 
@@ -32030,16 +32266,16 @@ test -d "$oldincludedir" && {
 
 cf_search="$cf_search $cf_header_path_list"
 
-    for cf_cv_header_path_iconv in $cf_search
-    do
-      if test -d $cf_cv_header_path_iconv ; then
-        test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
+	for cf_cv_header_path_iconv in $cf_search
+	do
+		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}:32038: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32274: 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 32042 "configure"
+			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
+			cat >conftest.$ac_ext <<_ACEOF
+#line 32278 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32058,44 +32294,44 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32061: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32297: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32064: \$? = $ac_status" >&5
+  echo "$as_me:32300: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32070: \$? = $ac_status" >&5
+  echo "$as_me:32306: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-            test -n "$verbose" && echo "	... found iconv headers in $cf_cv_header_path_iconv" 1>&6
+				test -n "$verbose" && echo "	... found iconv headers in $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me:-configure}:32075: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32311: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
-            cf_cv_find_linkage_iconv=maybe
-            cf_test_CPPFLAGS="$CPPFLAGS"
-            break
+				cf_cv_find_linkage_iconv=maybe
+				cf_test_CPPFLAGS="$CPPFLAGS"
+				break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-            CPPFLAGS="$cf_save_CPPFLAGS"
+				CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-      fi
-    done
+		fi
+	done
 
-    if test "$cf_cv_find_linkage_iconv" = maybe ; then
+	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:32093: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32329: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
-      cf_save_LIBS="$LIBS"
-      cf_save_LDFLAGS="$LDFLAGS"
+		cf_save_LIBS="$LIBS"
+		cf_save_LDFLAGS="$LDFLAGS"
 
-      if test "$cf_cv_find_linkage_iconv" != yes ; then
+		if test "$cf_cv_find_linkage_iconv" != yes ; then
 
 cf_search=
 cf_library_path_list=""
@@ -32160,18 +32396,18 @@ done
 
 cf_search="$cf_library_path_list $cf_search"
 
-        for cf_cv_library_path_iconv in $cf_search
-        do
-          if test -d $cf_cv_library_path_iconv ; then
-            test -n "$verbose" && echo "	... testing $cf_cv_library_path_iconv" 1>&6
+			for cf_cv_library_path_iconv in $cf_search
+			do
+				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}:32168: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32404: 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 32174 "configure"
+					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 32410 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32190,44 +32426,44 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32193: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32429: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32196: \$? = $ac_status" >&5
+  echo "$as_me:32432: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32199: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32435: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32202: \$? = $ac_status" >&5
+  echo "$as_me:32438: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-                test -n "$verbose" && echo "	... found iconv library in $cf_cv_library_path_iconv" 1>&6
+					test -n "$verbose" && echo "	... found iconv library in $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me:-configure}:32207: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32443: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
-                cf_cv_find_linkage_iconv=yes
-                cf_cv_library_file_iconv="-liconv"
-                break
+					cf_cv_find_linkage_iconv=yes
+					cf_cv_library_file_iconv="-liconv"
+					break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-                CPPFLAGS="$cf_save_CPPFLAGS"
-                LIBS="$cf_save_LIBS"
-                LDFLAGS="$cf_save_LDFLAGS"
+					CPPFLAGS="$cf_save_CPPFLAGS"
+					LIBS="$cf_save_LIBS"
+					LDFLAGS="$cf_save_LDFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-          fi
-        done
-        CPPFLAGS="$cf_save_CPPFLAGS"
-        LDFLAGS="$cf_save_LDFLAGS"
-      fi
+				fi
+			done
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			LDFLAGS="$cf_save_LDFLAGS"
+		fi
 
-    else
-      cf_cv_find_linkage_iconv=no
-    fi
+	else
+		cf_cv_find_linkage_iconv=no
+	fi
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
@@ -32244,7 +32480,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:32247: result: $am_cv_func_iconv" >&5
+echo "$as_me:32483: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -32253,14 +32489,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:32256: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:32492: 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 32263 "configure"
+#line 32499 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32285,16 +32521,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32288: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32524: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32291: \$? = $ac_status" >&5
+  echo "$as_me:32527: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32294: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32297: \$? = $ac_status" >&5
+  echo "$as_me:32533: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -32304,7 +32540,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:32307: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:32543: 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
@@ -32346,7 +32582,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 32349 "configure"
+#line 32585 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32358,16 +32594,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32361: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32597: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32364: \$? = $ac_status" >&5
+  echo "$as_me:32600: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32603: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32370: \$? = $ac_status" >&5
+  echo "$as_me:32606: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32384,7 +32620,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}:32387: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32623: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32403,30 +32639,30 @@ fi
       LIBICONV="-liconv"
 
 if test -n "$cf_cv_library_path_iconv" ; then
-  for cf_add_libdir in $cf_cv_library_path_iconv
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_cv_library_path_iconv
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:32424: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32660: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
     fi
@@ -32445,7 +32681,7 @@ case $cf_cv_screen in
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:32448: checking if you want to use default-colors" >&5
+echo "$as_me:32684: 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.
@@ -32462,7 +32698,7 @@ else
   use_dft_colors=no
 
 fi;
-echo "$as_me:32465: result: $use_dft_colors" >&5
+echo "$as_me:32701: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test $use_dft_colors = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -32471,7 +32707,7 @@ EOF
 
 fi
 
-echo "$as_me:32474: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:32710: 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.
@@ -32488,14 +32724,14 @@ else
   use_kbd_layout=no
 
 fi;
-echo "$as_me:32491: result: $use_kbd_layout" >&5
+echo "$as_me:32727: 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:32498: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:32734: 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.
@@ -32512,14 +32748,14 @@ else
   use_nested_tables=no
 
 fi;
-echo "$as_me:32515: result: $use_nested_tables" >&5
+echo "$as_me:32751: 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:32522: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:32758: 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.
@@ -32536,14 +32772,14 @@ else
   use_alt_bindings=yes
 
 fi;
-echo "$as_me:32539: result: $use_alt_bindings" >&5
+echo "$as_me:32775: 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:32546: checking if ascii case-conversion should be used" >&5
+echo "$as_me:32782: 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.
@@ -32560,14 +32796,14 @@ else
   use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:32563: result: $use_ascii_ctypes" >&5
+echo "$as_me:32799: 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:32570: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:32806: 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.
@@ -32584,14 +32820,14 @@ else
   use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:32587: result: $use_ext_htmldtd" >&5
+echo "$as_me:32823: 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:32594: checking if file-upload logic should be used" >&5
+echo "$as_me:32830: 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.
@@ -32608,14 +32844,14 @@ else
   use_file_upload=yes
 
 fi;
-echo "$as_me:32611: result: $use_file_upload" >&5
+echo "$as_me:32847: 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:32618: checking if IDNA support should be used" >&5
+echo "$as_me:32854: 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.
@@ -32632,7 +32868,7 @@ else
   use_idna=yes
 
 fi;
-echo "$as_me:32635: result: $use_idna" >&5
+echo "$as_me:32871: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -32671,7 +32907,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32674 "configure"
+#line 32910 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32683,16 +32919,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32686: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32922: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32689: \$? = $ac_status" >&5
+  echo "$as_me:32925: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32692: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32695: \$? = $ac_status" >&5
+  echo "$as_me:32931: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32709,7 +32945,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}:32712: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32948: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32750,7 +32986,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32753 "configure"
+#line 32989 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32762,16 +32998,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32765: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33001: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32768: \$? = $ac_status" >&5
+  echo "$as_me:33004: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33007: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32774: \$? = $ac_status" >&5
+  echo "$as_me:33010: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32788,7 +33024,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}:32791: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33027: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32804,70 +33040,70 @@ echo "${as_me:-configure}:32791: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:32807: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:33043: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 	if test -d $cf_searchpath/lib; then
 
 if test -n "$cf_searchpath/lib" ; then
-  for cf_add_libdir in $cf_searchpath/lib
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath/lib
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:32832: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33068: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	elif test -d $cf_searchpath ; then
 
 if test -n "$cf_searchpath" ; then
-  for cf_add_libdir in $cf_searchpath
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:32861: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33097: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	else
-{ { echo "$as_me:32870: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:33106: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32881,12 +33117,12 @@ done
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me:-configure}:32884: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33120: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32889 "configure"
+#line 33125 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32904,16 +33140,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32907: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33143: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32910: \$? = $ac_status" >&5
+  echo "$as_me:33146: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32916: \$? = $ac_status" >&5
+  echo "$as_me:33152: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -32927,7 +33163,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32930 "configure"
+#line 33166 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32945,16 +33181,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32948: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33184: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32951: \$? = $ac_status" >&5
+  echo "$as_me:33187: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32954: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32957: \$? = $ac_status" >&5
+  echo "$as_me:33193: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -32969,14 +33205,14 @@ cat conftest.$ac_ext >&5
 	cf_cv_find_linkage_idn=no
 	LIBS="$cf_save_LIBS"
 
-    test -n "$verbose" && echo "	find linkage for idn library" 1>&6
+	test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me:-configure}:32974: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:33210: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me:-configure}:32976: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33212: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
-    cf_save_CPPFLAGS="$CPPFLAGS"
-    cf_test_CPPFLAGS="$CPPFLAGS"
+	cf_save_CPPFLAGS="$CPPFLAGS"
+	cf_test_CPPFLAGS="$CPPFLAGS"
 
 cf_search=
 
@@ -33059,16 +33295,16 @@ test -d "$oldincludedir" && {
 
 cf_search="$cf_search $cf_header_path_list"
 
-    for cf_cv_header_path_idn in $cf_search
-    do
-      if test -d $cf_cv_header_path_idn ; then
-        test -n "$verbose" && echo "	... testing $cf_cv_header_path_idn" 1>&6
+	for cf_cv_header_path_idn in $cf_search
+	do
+		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}:33067: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:33303: 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 33071 "configure"
+			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_idn"
+			cat >conftest.$ac_ext <<_ACEOF
+#line 33307 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33086,44 +33322,44 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33089: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33325: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33092: \$? = $ac_status" >&5
+  echo "$as_me:33328: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33095: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33098: \$? = $ac_status" >&5
+  echo "$as_me:33334: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-            test -n "$verbose" && echo "	... found idn headers in $cf_cv_header_path_idn" 1>&6
+				test -n "$verbose" && echo "	... found idn headers in $cf_cv_header_path_idn" 1>&6
 
-echo "${as_me:-configure}:33103: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:33339: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
-            cf_cv_find_linkage_idn=maybe
-            cf_test_CPPFLAGS="$CPPFLAGS"
-            break
+				cf_cv_find_linkage_idn=maybe
+				cf_test_CPPFLAGS="$CPPFLAGS"
+				break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-            CPPFLAGS="$cf_save_CPPFLAGS"
+				CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-      fi
-    done
+		fi
+	done
 
-    if test "$cf_cv_find_linkage_idn" = maybe ; then
+	if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me:-configure}:33121: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33357: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
-      cf_save_LIBS="$LIBS"
-      cf_save_LDFLAGS="$LDFLAGS"
+		cf_save_LIBS="$LIBS"
+		cf_save_LDFLAGS="$LDFLAGS"
 
-      if test "$cf_cv_find_linkage_idn" != yes ; then
+		if test "$cf_cv_find_linkage_idn" != yes ; then
 
 cf_search=
 cf_library_path_list=""
@@ -33188,18 +33424,18 @@ done
 
 cf_search="$cf_library_path_list $cf_search"
 
-        for cf_cv_library_path_idn in $cf_search
-        do
-          if test -d $cf_cv_library_path_idn ; then
-            test -n "$verbose" && echo "	... testing $cf_cv_library_path_idn" 1>&6
+			for cf_cv_library_path_idn in $cf_search
+			do
+				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}:33196: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:33432: 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 33202 "configure"
+					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 33438 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33217,44 +33453,44 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33220: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33456: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33223: \$? = $ac_status" >&5
+  echo "$as_me:33459: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33229: \$? = $ac_status" >&5
+  echo "$as_me:33465: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-                test -n "$verbose" && echo "	... found idn library in $cf_cv_library_path_idn" 1>&6
+					test -n "$verbose" && echo "	... found idn library in $cf_cv_library_path_idn" 1>&6
 
-echo "${as_me:-configure}:33234: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:33470: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
-                cf_cv_find_linkage_idn=yes
-                cf_cv_library_file_idn="-lidn"
-                break
+					cf_cv_find_linkage_idn=yes
+					cf_cv_library_file_idn="-lidn"
+					break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-                CPPFLAGS="$cf_save_CPPFLAGS"
-                LIBS="$cf_save_LIBS"
-                LDFLAGS="$cf_save_LDFLAGS"
+					CPPFLAGS="$cf_save_CPPFLAGS"
+					LIBS="$cf_save_LIBS"
+					LDFLAGS="$cf_save_LDFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-          fi
-        done
-        CPPFLAGS="$cf_save_CPPFLAGS"
-        LDFLAGS="$cf_save_LDFLAGS"
-      fi
+				fi
+			done
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			LDFLAGS="$cf_save_LDFLAGS"
+		fi
 
-    else
-      cf_cv_find_linkage_idn=no
-    fi
+	else
+		cf_cv_find_linkage_idn=no
+	fi
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
@@ -33290,7 +33526,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 33293 "configure"
+#line 33529 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33302,16 +33538,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33305: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33541: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33308: \$? = $ac_status" >&5
+  echo "$as_me:33544: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33547: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33314: \$? = $ac_status" >&5
+  echo "$as_me:33550: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33328,7 +33564,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}:33331: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33567: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33344,30 +33580,30 @@ echo "${as_me:-configure}:33331: testing adding $cf_add_incdir to include-path .
 fi
 
 if test -n "$cf_cv_library_path_idn" ; then
-  for cf_add_libdir in $cf_cv_library_path_idn
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_cv_library_path_idn
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:33365: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33601: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 cf_add_libs="-lidn"
@@ -33387,7 +33623,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:33390: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:33626: WARNING: Cannot find idn library" >&5
 echo "$as_me: WARNING: Cannot find idn library" >&2;}
 fi
 
@@ -33401,7 +33637,7 @@ fi
 
 fi
 
-echo "$as_me:33404: checking if element-justification logic should be used" >&5
+echo "$as_me:33640: 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.
@@ -33418,14 +33654,14 @@ else
   use_justify_elts=yes
 
 fi;
-echo "$as_me:33421: result: $use_justify_elts" >&5
+echo "$as_me:33657: 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:33428: checking if partial-display should be used" >&5
+echo "$as_me:33664: 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.
@@ -33442,14 +33678,14 @@ else
   use_partial_display=yes
 
 fi;
-echo "$as_me:33445: result: $use_partial_display" >&5
+echo "$as_me:33681: 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:33452: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:33688: 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.
@@ -33466,14 +33702,14 @@ else
   use_filed_cookies=yes
 
 fi;
-echo "$as_me:33469: result: $use_filed_cookies" >&5
+echo "$as_me:33705: 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:33476: checking if html source should be colorized" >&5
+echo "$as_me:33712: 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.
@@ -33490,14 +33726,14 @@ else
   use_prettysrc=yes
 
 fi;
-echo "$as_me:33493: result: $use_prettysrc" >&5
+echo "$as_me:33729: 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:33500: checking if progress-bar code should be used" >&5
+echo "$as_me:33736: 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.
@@ -33514,14 +33750,14 @@ else
   use_progressbar=yes
 
 fi;
-echo "$as_me:33517: result: $use_progressbar" >&5
+echo "$as_me:33753: 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:33524: checking if read-progress message should show ETA" >&5
+echo "$as_me:33760: 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.
@@ -33538,14 +33774,14 @@ else
   use_read_eta=yes
 
 fi;
-echo "$as_me:33541: result: $use_read_eta" >&5
+echo "$as_me:33777: 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:33548: checking if source caching should be used" >&5
+echo "$as_me:33784: 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.
@@ -33562,14 +33798,14 @@ else
   use_source_cache=yes
 
 fi;
-echo "$as_me:33565: result: $use_source_cache" >&5
+echo "$as_me:33801: 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:33572: checking if scrollbar code should be used" >&5
+echo "$as_me:33808: 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.
@@ -33586,10 +33822,10 @@ else
   use_scrollbar=yes
 
 fi;
-echo "$as_me:33589: result: $use_scrollbar" >&5
+echo "$as_me:33825: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:33592: checking if charset-selection logic should be used" >&5
+echo "$as_me:33828: 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.
@@ -33606,14 +33842,14 @@ else
   use_charset_choice=no
 
 fi;
-echo "$as_me:33609: result: $use_charset_choice" >&5
+echo "$as_me:33845: 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:33616: checking if you want to use external commands" >&5
+echo "$as_me:33852: 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.
@@ -33630,7 +33866,7 @@ else
   use_externs=no
 
 fi;
-echo "$as_me:33633: result: $use_externs" >&5
+echo "$as_me:33869: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 
@@ -33641,7 +33877,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:33644: checking if you want to use setfont support" >&5
+echo "$as_me:33880: 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.
@@ -33658,7 +33894,7 @@ else
   use_setfont=no
 
 fi;
-echo "$as_me:33661: result: $use_setfont" >&5
+echo "$as_me:33897: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -33669,7 +33905,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:33672: checking for $ac_word" >&5
+echo "$as_me:33908: 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
@@ -33686,7 +33922,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:33689: found $ac_dir/$ac_word" >&5
+   echo "$as_me:33925: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -33697,10 +33933,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:33700: result: $SETFONT" >&5
+  echo "$as_me:33936: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:33703: result: no" >&5
+  echo "$as_me:33939: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -33717,32 +33953,32 @@ do
 		if test "$with_full_paths" = yes ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$cf_temp" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval cf_temp="$cf_temp"
-  case ".$cf_temp" in
-  (.NONE/*)
-    cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval cf_temp="$cf_temp"
+	case ".$cf_temp" in
+	(.NONE/*)
+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  break
-  ;;
+	break
+	;;
 esac
 
 			cf_path_prog="$cf_temp"
@@ -33759,7 +33995,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:33762: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:33998: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -33777,19 +34013,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me:-configure}:33780: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:34016: 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}:33787: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:34023: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:33792: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:34028: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 
@@ -33800,7 +34036,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:33803: checking if you want cgi-link support" >&5
+echo "$as_me:34039: 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.
@@ -33817,10 +34053,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:33820: result: $enableval" >&5
+echo "$as_me:34056: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:33823: checking if you want change-exec support" >&5
+echo "$as_me:34059: 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.
@@ -33837,14 +34073,14 @@ else
   use_change_exec=no
 
 fi;
-echo "$as_me:33840: result: $use_change_exec" >&5
+echo "$as_me:34076: 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:33847: checking if you want exec-links support" >&5
+echo "$as_me:34083: 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.
@@ -33861,14 +34097,14 @@ else
   use_exec_links=$enableval
 
 fi;
-echo "$as_me:33864: result: $use_exec_links" >&5
+echo "$as_me:34100: 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:33871: checking if you want exec-scripts support" >&5
+echo "$as_me:34107: 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.
@@ -33885,14 +34121,14 @@ else
   use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:33888: result: $use_exec_scripts" >&5
+echo "$as_me:34124: 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:33895: checking if you want internal-links feature" >&5
+echo "$as_me:34131: 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.
@@ -33909,14 +34145,14 @@ else
   use_internal_links=no
 
 fi;
-echo "$as_me:33912: result: $use_internal_links" >&5
+echo "$as_me:34148: 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:33919: checking if you want to fork NSL requests" >&5
+echo "$as_me:34155: 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.
@@ -33933,7 +34169,7 @@ else
   use_nsl_fork=no
 
 fi;
-echo "$as_me:33936: result: $use_nsl_fork" >&5
+echo "$as_me:34172: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test $use_nsl_fork = yes ; then
 	case $host_os in
@@ -33954,7 +34190,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:33957: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:34193: 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.
@@ -33971,14 +34207,14 @@ else
   use_syslog=no
 
 fi;
-echo "$as_me:33974: result: $use_syslog" >&5
+echo "$as_me:34210: 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:33981: checking if you want to underline links" >&5
+echo "$as_me:34217: 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.
@@ -33995,7 +34231,7 @@ else
   use_underline=no
 
 fi;
-echo "$as_me:33998: result: $use_underline" >&5
+echo "$as_me:34234: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes &&
 cat >>confdefs.h <<\EOF
@@ -34007,7 +34243,7 @@ cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:34010: checking if help files should be gzip'ed" >&5
+echo "$as_me:34246: 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.
@@ -34024,10 +34260,10 @@ else
   use_gzip_help=no
 
 fi;
-echo "$as_me:34027: result: $use_gzip_help" >&5
+echo "$as_me:34263: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:34030: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:34266: 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.
@@ -34037,7 +34273,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:34040: result: $use_bzlib" >&5
+echo "$as_me:34276: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -34076,7 +34312,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34079 "configure"
+#line 34315 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34088,16 +34324,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34091: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34327: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34094: \$? = $ac_status" >&5
+  echo "$as_me:34330: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34333: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34100: \$? = $ac_status" >&5
+  echo "$as_me:34336: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34114,7 +34350,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}:34117: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34353: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34155,7 +34391,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34158 "configure"
+#line 34394 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34167,16 +34403,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34170: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34406: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34173: \$? = $ac_status" >&5
+  echo "$as_me:34409: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34179: \$? = $ac_status" >&5
+  echo "$as_me:34415: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34193,7 +34429,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}:34196: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34432: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34209,70 +34445,70 @@ echo "${as_me:-configure}:34196: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:34212: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:34448: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 	if test -d $cf_searchpath/lib; then
 
 if test -n "$cf_searchpath/lib" ; then
-  for cf_add_libdir in $cf_searchpath/lib
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath/lib
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:34237: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34473: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	elif test -d $cf_searchpath ; then
 
 if test -n "$cf_searchpath" ; then
-  for cf_add_libdir in $cf_searchpath
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:34266: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34502: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	else
-{ { echo "$as_me:34275: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:34511: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -34286,12 +34522,12 @@ done
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me:-configure}:34289: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34525: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 34294 "configure"
+#line 34530 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34308,16 +34544,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34311: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34547: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34314: \$? = $ac_status" >&5
+  echo "$as_me:34550: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34320: \$? = $ac_status" >&5
+  echo "$as_me:34556: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -34331,7 +34567,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 34334 "configure"
+#line 34570 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34348,16 +34584,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34351: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34587: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34354: \$? = $ac_status" >&5
+  echo "$as_me:34590: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34357: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34593: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34360: \$? = $ac_status" >&5
+  echo "$as_me:34596: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -34372,14 +34608,14 @@ cat conftest.$ac_ext >&5
 	cf_cv_find_linkage_bz2=no
 	LIBS="$cf_save_LIBS"
 
-    test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
+	test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me:-configure}:34377: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:34613: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me:-configure}:34379: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34615: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
-    cf_save_CPPFLAGS="$CPPFLAGS"
-    cf_test_CPPFLAGS="$CPPFLAGS"
+	cf_save_CPPFLAGS="$CPPFLAGS"
+	cf_test_CPPFLAGS="$CPPFLAGS"
 
 cf_search=
 
@@ -34462,16 +34698,16 @@ test -d "$oldincludedir" && {
 
 cf_search="$cf_search $cf_header_path_list"
 
-    for cf_cv_header_path_bz2 in $cf_search
-    do
-      if test -d $cf_cv_header_path_bz2 ; then
-        test -n "$verbose" && echo "	... testing $cf_cv_header_path_bz2" 1>&6
+	for cf_cv_header_path_bz2 in $cf_search
+	do
+		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}:34470: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34706: 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 34474 "configure"
+			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_bz2"
+			cat >conftest.$ac_ext <<_ACEOF
+#line 34710 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34488,47 +34724,47 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34491: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34494: \$? = $ac_status" >&5
+  echo "$as_me:34730: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34500: \$? = $ac_status" >&5
+  echo "$as_me:34736: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-            test -n "$verbose" && echo "	... found bz2 headers in $cf_cv_header_path_bz2" 1>&6
+				test -n "$verbose" && echo "	... found bz2 headers in $cf_cv_header_path_bz2" 1>&6
 
-echo "${as_me:-configure}:34505: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34741: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
-            cf_cv_find_linkage_bz2=maybe
-            cf_test_CPPFLAGS="$CPPFLAGS"
-            break
+				cf_cv_find_linkage_bz2=maybe
+				cf_test_CPPFLAGS="$CPPFLAGS"
+				break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-            CPPFLAGS="$cf_save_CPPFLAGS"
+				CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-      fi
-    done
+		fi
+	done
 
-    if test "$cf_cv_find_linkage_bz2" = maybe ; then
+	if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me:-configure}:34523: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34759: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
-      cf_save_LIBS="$LIBS"
-      cf_save_LDFLAGS="$LDFLAGS"
+		cf_save_LIBS="$LIBS"
+		cf_save_LDFLAGS="$LDFLAGS"
 
-        CPPFLAGS="$cf_test_CPPFLAGS"
-        LIBS="-lbz2  $cf_save_LIBS"
-        cat >conftest.$ac_ext <<_ACEOF
-#line 34531 "configure"
+		CPPFLAGS="$cf_test_CPPFLAGS"
+		LIBS="-lbz2  $cf_save_LIBS"
+		cat >conftest.$ac_ext <<_ACEOF
+#line 34767 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34545,32 +34781,32 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34784: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34551: \$? = $ac_status" >&5
+  echo "$as_me:34787: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34557: \$? = $ac_status" >&5
+  echo "$as_me:34793: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-            test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
+			test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me:-configure}:34562: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:34798: testing ... found bz2 library in system ..." 1>&5
 
-            cf_cv_find_linkage_bz2=yes
+			cf_cv_find_linkage_bz2=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-            CPPFLAGS="$cf_save_CPPFLAGS"
-            LIBS="$cf_save_LIBS"
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			LIBS="$cf_save_LIBS"
 
-      if test "$cf_cv_find_linkage_bz2" != yes ; then
+		if test "$cf_cv_find_linkage_bz2" != yes ; then
 
 cf_search=
 cf_library_path_list=""
@@ -34635,18 +34871,18 @@ done
 
 cf_search="$cf_library_path_list $cf_search"
 
-        for cf_cv_library_path_bz2 in $cf_search
-        do
-          if test -d $cf_cv_library_path_bz2 ; then
-            test -n "$verbose" && echo "	... testing $cf_cv_library_path_bz2" 1>&6
+			for cf_cv_library_path_bz2 in $cf_search
+			do
+				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}:34643: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34879: 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 34649 "configure"
+					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 34885 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34663,44 +34899,44 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34666: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34902: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34669: \$? = $ac_status" >&5
+  echo "$as_me:34905: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34908: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34675: \$? = $ac_status" >&5
+  echo "$as_me:34911: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-                test -n "$verbose" && echo "	... found bz2 library in $cf_cv_library_path_bz2" 1>&6
+					test -n "$verbose" && echo "	... found bz2 library in $cf_cv_library_path_bz2" 1>&6
 
-echo "${as_me:-configure}:34680: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34916: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
-                cf_cv_find_linkage_bz2=yes
-                cf_cv_library_file_bz2="-lbz2"
-                break
+					cf_cv_find_linkage_bz2=yes
+					cf_cv_library_file_bz2="-lbz2"
+					break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-                CPPFLAGS="$cf_save_CPPFLAGS"
-                LIBS="$cf_save_LIBS"
-                LDFLAGS="$cf_save_LDFLAGS"
+					CPPFLAGS="$cf_save_CPPFLAGS"
+					LIBS="$cf_save_LIBS"
+					LDFLAGS="$cf_save_LDFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-          fi
-        done
-        CPPFLAGS="$cf_save_CPPFLAGS"
-        LDFLAGS="$cf_save_LDFLAGS"
-      fi
+				fi
+			done
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			LDFLAGS="$cf_save_LDFLAGS"
+		fi
 
-    else
-      cf_cv_find_linkage_bz2=no
-    fi
+	else
+		cf_cv_find_linkage_bz2=no
+	fi
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
@@ -34736,7 +34972,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 34739 "configure"
+#line 34975 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34748,16 +34984,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34751: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34987: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34754: \$? = $ac_status" >&5
+  echo "$as_me:34990: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34760: \$? = $ac_status" >&5
+  echo "$as_me:34996: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34774,7 +35010,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}:34777: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35013: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34790,30 +35026,30 @@ echo "${as_me:-configure}:34777: testing adding $cf_add_incdir to include-path .
 fi
 
 if test -n "$cf_cv_library_path_bz2" ; then
-  for cf_add_libdir in $cf_cv_library_path_bz2
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_cv_library_path_bz2
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:34811: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35047: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 cf_add_libs="-lbz2"
@@ -34833,7 +35069,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:34836: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:35072: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -34844,7 +35080,7 @@ EOF
 
 fi
 
-echo "$as_me:34847: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:35083: 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.
@@ -34854,7 +35090,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:34857: result: $use_zlib" >&5
+echo "$as_me:35093: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -34893,7 +35129,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34896 "configure"
+#line 35132 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34905,16 +35141,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34908: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35144: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34911: \$? = $ac_status" >&5
+  echo "$as_me:35147: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34914: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34917: \$? = $ac_status" >&5
+  echo "$as_me:35153: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34931,7 +35167,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}:34934: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35170: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34972,7 +35208,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34975 "configure"
+#line 35211 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34984,16 +35220,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35223: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34990: \$? = $ac_status" >&5
+  echo "$as_me:35226: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34996: \$? = $ac_status" >&5
+  echo "$as_me:35232: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35010,7 +35246,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}:35013: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35249: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35026,70 +35262,70 @@ echo "${as_me:-configure}:35013: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:35029: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:35265: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 	if test -d $cf_searchpath/lib; then
 
 if test -n "$cf_searchpath/lib" ; then
-  for cf_add_libdir in $cf_searchpath/lib
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath/lib
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:35054: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35290: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	elif test -d $cf_searchpath ; then
 
 if test -n "$cf_searchpath" ; then
-  for cf_add_libdir in $cf_searchpath
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_searchpath
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:35083: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35319: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 	else
-{ { echo "$as_me:35092: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:35328: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35103,12 +35339,12 @@ done
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me:-configure}:35106: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35342: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35111 "configure"
+#line 35347 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35124,16 +35360,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35127: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35363: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35130: \$? = $ac_status" >&5
+  echo "$as_me:35366: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35136: \$? = $ac_status" >&5
+  echo "$as_me:35372: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -35147,7 +35383,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35150 "configure"
+#line 35386 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35163,16 +35399,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35166: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35402: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35169: \$? = $ac_status" >&5
+  echo "$as_me:35405: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35172: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35175: \$? = $ac_status" >&5
+  echo "$as_me:35411: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -35187,14 +35423,14 @@ cat conftest.$ac_ext >&5
 	cf_cv_find_linkage_z=no
 	LIBS="$cf_save_LIBS"
 
-    test -n "$verbose" && echo "	find linkage for z library" 1>&6
+	test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me:-configure}:35192: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:35428: testing find linkage for z library ..." 1>&5
 
-echo "${as_me:-configure}:35194: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35430: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
-    cf_save_CPPFLAGS="$CPPFLAGS"
-    cf_test_CPPFLAGS="$CPPFLAGS"
+	cf_save_CPPFLAGS="$CPPFLAGS"
+	cf_test_CPPFLAGS="$CPPFLAGS"
 
 cf_search=
 
@@ -35277,16 +35513,16 @@ test -d "$oldincludedir" && {
 
 cf_search="$cf_search $cf_header_path_list"
 
-    for cf_cv_header_path_z in $cf_search
-    do
-      if test -d $cf_cv_header_path_z ; then
-        test -n "$verbose" && echo "	... testing $cf_cv_header_path_z" 1>&6
+	for cf_cv_header_path_z in $cf_search
+	do
+		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}:35285: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:35521: 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 35289 "configure"
+			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_z"
+			cat >conftest.$ac_ext <<_ACEOF
+#line 35525 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35302,47 +35538,47 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35305: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35541: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35308: \$? = $ac_status" >&5
+  echo "$as_me:35544: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35547: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35314: \$? = $ac_status" >&5
+  echo "$as_me:35550: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-            test -n "$verbose" && echo "	... found z headers in $cf_cv_header_path_z" 1>&6
+				test -n "$verbose" && echo "	... found z headers in $cf_cv_header_path_z" 1>&6
 
-echo "${as_me:-configure}:35319: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:35555: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
-            cf_cv_find_linkage_z=maybe
-            cf_test_CPPFLAGS="$CPPFLAGS"
-            break
+				cf_cv_find_linkage_z=maybe
+				cf_test_CPPFLAGS="$CPPFLAGS"
+				break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-            CPPFLAGS="$cf_save_CPPFLAGS"
+				CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-      fi
-    done
+		fi
+	done
 
-    if test "$cf_cv_find_linkage_z" = maybe ; then
+	if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me:-configure}:35337: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35573: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
-      cf_save_LIBS="$LIBS"
-      cf_save_LDFLAGS="$LDFLAGS"
+		cf_save_LIBS="$LIBS"
+		cf_save_LDFLAGS="$LDFLAGS"
 
-        CPPFLAGS="$cf_test_CPPFLAGS"
-        LIBS="-lz  $cf_save_LIBS"
-        cat >conftest.$ac_ext <<_ACEOF
-#line 35345 "configure"
+		CPPFLAGS="$cf_test_CPPFLAGS"
+		LIBS="-lz  $cf_save_LIBS"
+		cat >conftest.$ac_ext <<_ACEOF
+#line 35581 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35358,32 +35594,32 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35597: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35364: \$? = $ac_status" >&5
+  echo "$as_me:35600: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35603: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35370: \$? = $ac_status" >&5
+  echo "$as_me:35606: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-            test -n "$verbose" && echo "	... found z library in system" 1>&6
+			test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me:-configure}:35375: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:35611: testing ... found z library in system ..." 1>&5
 
-            cf_cv_find_linkage_z=yes
+			cf_cv_find_linkage_z=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-            CPPFLAGS="$cf_save_CPPFLAGS"
-            LIBS="$cf_save_LIBS"
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			LIBS="$cf_save_LIBS"
 
-      if test "$cf_cv_find_linkage_z" != yes ; then
+		if test "$cf_cv_find_linkage_z" != yes ; then
 
 cf_search=
 cf_library_path_list=""
@@ -35448,18 +35684,18 @@ done
 
 cf_search="$cf_library_path_list $cf_search"
 
-        for cf_cv_library_path_z in $cf_search
-        do
-          if test -d $cf_cv_library_path_z ; then
-            test -n "$verbose" && echo "	... testing $cf_cv_library_path_z" 1>&6
+			for cf_cv_library_path_z in $cf_search
+			do
+				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}:35456: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:35692: 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 35462 "configure"
+					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 35698 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35475,44 +35711,44 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35478: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35714: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35481: \$? = $ac_status" >&5
+  echo "$as_me:35717: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35720: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35487: \$? = $ac_status" >&5
+  echo "$as_me:35723: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-                test -n "$verbose" && echo "	... found z library in $cf_cv_library_path_z" 1>&6
+					test -n "$verbose" && echo "	... found z library in $cf_cv_library_path_z" 1>&6
 
-echo "${as_me:-configure}:35492: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:35728: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
-                cf_cv_find_linkage_z=yes
-                cf_cv_library_file_z="-lz"
-                break
+					cf_cv_find_linkage_z=yes
+					cf_cv_library_file_z="-lz"
+					break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-                CPPFLAGS="$cf_save_CPPFLAGS"
-                LIBS="$cf_save_LIBS"
-                LDFLAGS="$cf_save_LDFLAGS"
+					CPPFLAGS="$cf_save_CPPFLAGS"
+					LIBS="$cf_save_LIBS"
+					LDFLAGS="$cf_save_LDFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-          fi
-        done
-        CPPFLAGS="$cf_save_CPPFLAGS"
-        LDFLAGS="$cf_save_LDFLAGS"
-      fi
+				fi
+			done
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			LDFLAGS="$cf_save_LDFLAGS"
+		fi
 
-    else
-      cf_cv_find_linkage_z=no
-    fi
+	else
+		cf_cv_find_linkage_z=no
+	fi
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
@@ -35548,7 +35784,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 35551 "configure"
+#line 35787 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35560,16 +35796,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35563: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35799: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35566: \$? = $ac_status" >&5
+  echo "$as_me:35802: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35572: \$? = $ac_status" >&5
+  echo "$as_me:35808: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35586,7 +35822,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}:35589: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35825: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35602,30 +35838,30 @@ echo "${as_me:-configure}:35589: testing adding $cf_add_incdir to include-path .
 fi
 
 if test -n "$cf_cv_library_path_z" ; then
-  for cf_add_libdir in $cf_cv_library_path_z
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+	for cf_add_libdir in $cf_cv_library_path_z
+	do
+		if test $cf_add_libdir = /usr/lib ; then
+			:
+		elif test -d $cf_add_libdir
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:35623: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35859: testing adding $cf_add_libdir to library-path ..." 1>&5
 
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
 fi
 
 cf_add_libs="-lz"
@@ -35645,7 +35881,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:35648: WARNING: Cannot find z library" >&5
+{ echo "$as_me:35884: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -35654,13 +35890,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:35657: checking for $ac_func" >&5
+echo "$as_me:35893: 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 35663 "configure"
+#line 35899 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -35691,16 +35927,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:35694: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35930: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35697: \$? = $ac_status" >&5
+  echo "$as_me:35933: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35703: \$? = $ac_status" >&5
+  echo "$as_me:35939: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -35710,7 +35946,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:35713: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:35949: 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
@@ -35727,7 +35963,7 @@ EOF
 
 fi
 
-echo "$as_me:35730: checking if you want to exclude FINGER code" >&5
+echo "$as_me:35966: 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.
@@ -35744,14 +35980,14 @@ else
   use_finger=no
 
 fi;
-echo "$as_me:35747: result: $use_finger" >&5
+echo "$as_me:35983: 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:35754: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:35990: 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.
@@ -35768,14 +36004,14 @@ else
   use_gopher=no
 
 fi;
-echo "$as_me:35771: result: $use_gopher" >&5
+echo "$as_me:36007: 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:35778: checking if you want to exclude NEWS code" >&5
+echo "$as_me:36014: 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.
@@ -35792,14 +36028,14 @@ else
   use_news=no
 
 fi;
-echo "$as_me:35795: result: $use_news" >&5
+echo "$as_me:36031: 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:35802: checking if you want to exclude FTP code" >&5
+echo "$as_me:36038: 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.
@@ -35816,14 +36052,14 @@ else
   use_ftp=no
 
 fi;
-echo "$as_me:35819: result: $use_ftp" >&5
+echo "$as_me:36055: 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:35826: checking if you want to include WAIS code" >&5
+echo "$as_me:36062: 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.
@@ -35840,13 +36076,13 @@ else
   use_wais=no
 
 fi;
-echo "$as_me:35843: result: $use_wais" >&5
+echo "$as_me:36079: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test $use_wais != "no"
 then
-	echo "$as_me:35849: checking for fs_free in -lwais" >&5
+	echo "$as_me:36085: 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
@@ -35854,7 +36090,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 35857 "configure"
+#line 36093 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -35873,16 +36109,16 @@ fs_free ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35876: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36112: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35879: \$? = $ac_status" >&5
+  echo "$as_me:36115: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36118: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35885: \$? = $ac_status" >&5
+  echo "$as_me:36121: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -35893,18 +36129,18 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:35896: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:36132: 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:35900: checking if -lm needed for math functions" >&5
+echo "$as_me:36136: 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 35907 "configure"
+#line 36143 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -35919,16 +36155,16 @@ double x = rand(); printf("result = %g\n", sin(x))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35922: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36158: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35925: \$? = $ac_status" >&5
+  echo "$as_me:36161: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35931: \$? = $ac_status" >&5
+  echo "$as_me:36167: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
@@ -35938,7 +36174,7 @@ cf_cv_need_libm=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:35941: result: $cf_cv_need_libm" >&5
+echo "$as_me:36177: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
@@ -35980,23 +36216,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:35983: checking for $ac_header" >&5
+echo "$as_me:36219: 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 35989 "configure"
+#line 36225 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:35993: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:36229: \"$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:35999: \$? = $ac_status" >&5
+  echo "$as_me:36235: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -36015,7 +36251,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:36018: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:36254: 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
@@ -36028,7 +36264,7 @@ done
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:36031: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:36267: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -36036,7 +36272,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:36039: checking if directory-editor code should be used" >&5
+echo "$as_me:36275: 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.
@@ -36053,7 +36289,7 @@ else
   use_dired=yes
 
 fi;
-echo "$as_me:36056: result: $use_dired" >&5
+echo "$as_me:36292: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -36063,7 +36299,7 @@ cat >>confdefs.h <<\EOF
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:36066: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:36302: 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.
@@ -36080,10 +36316,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:36083: result: $enableval" >&5
+	echo "$as_me:36319: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36086: checking if DirEd mode should override keys" >&5
+	echo "$as_me:36322: 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.
@@ -36107,10 +36343,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36110: result: $enableval" >&5
+	echo "$as_me:36346: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36113: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:36349: 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.
@@ -36134,10 +36370,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36137: result: $enableval" >&5
+	echo "$as_me:36373: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36140: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:36376: 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.
@@ -36154,10 +36390,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:36157: result: $enableval" >&5
+	echo "$as_me:36393: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36160: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:36396: 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.
@@ -36181,10 +36417,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36184: result: $enableval" >&5
+	echo "$as_me:36420: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36187: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:36423: 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.
@@ -36208,10 +36444,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36211: result: $enableval" >&5
+	echo "$as_me:36447: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36214: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:36450: 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.
@@ -36235,10 +36471,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36238: result: $enableval" >&5
+	echo "$as_me:36474: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36241: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:36477: 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.
@@ -36262,11 +36498,11 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36265: result: $enableval" >&5
+	echo "$as_me:36501: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:36269: checking if you want long-directory listings" >&5
+echo "$as_me:36505: 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.
@@ -36290,10 +36526,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-echo "$as_me:36293: result: $enableval" >&5
+echo "$as_me:36529: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:36296: checking if parent-directory references are permitted" >&5
+echo "$as_me:36532: 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.
@@ -36310,7 +36546,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:36313: result: $enableval" >&5
+echo "$as_me:36549: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -36318,7 +36554,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:36321: checking for $ac_word" >&5
+echo "$as_me:36557: 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
@@ -36335,7 +36571,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:36338: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36574: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36346,10 +36582,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:36349: result: $TELNET" >&5
+  echo "$as_me:36585: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:36352: result: no" >&5
+  echo "$as_me:36588: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36366,32 +36602,32 @@ do
 		if test "$with_full_paths" = yes ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$cf_temp" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval cf_temp="$cf_temp"
-  case ".$cf_temp" in
-  (.NONE/*)
-    cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval cf_temp="$cf_temp"
+	case ".$cf_temp" in
+	(.NONE/*)
+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  break
-  ;;
+	break
+	;;
 esac
 
 			cf_path_prog="$cf_temp"
@@ -36408,7 +36644,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36411: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36647: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -36426,7 +36662,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:36429: checking for $ac_word" >&5
+echo "$as_me:36665: 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
@@ -36443,7 +36679,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:36446: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36682: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36454,10 +36690,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:36457: result: $TN3270" >&5
+  echo "$as_me:36693: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:36460: result: no" >&5
+  echo "$as_me:36696: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36474,32 +36710,32 @@ do
 		if test "$with_full_paths" = yes ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$cf_temp" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval cf_temp="$cf_temp"
-  case ".$cf_temp" in
-  (.NONE/*)
-    cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval cf_temp="$cf_temp"
+	case ".$cf_temp" in
+	(.NONE/*)
+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  break
-  ;;
+	break
+	;;
 esac
 
 			cf_path_prog="$cf_temp"
@@ -36516,7 +36752,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36519: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36755: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -36534,7 +36770,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:36537: checking for $ac_word" >&5
+echo "$as_me:36773: 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
@@ -36551,7 +36787,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:36554: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36790: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36562,10 +36798,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:36565: result: $RLOGIN" >&5
+  echo "$as_me:36801: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:36568: result: no" >&5
+  echo "$as_me:36804: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36582,32 +36818,32 @@ do
 		if test "$with_full_paths" = yes ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$cf_temp" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval cf_temp="$cf_temp"
-  case ".$cf_temp" in
-  (.NONE/*)
-    cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval cf_temp="$cf_temp"
+	case ".$cf_temp" in
+	(.NONE/*)
+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  break
-  ;;
+	break
+	;;
 esac
 
 			cf_path_prog="$cf_temp"
@@ -36624,7 +36860,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36627: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36863: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -36642,7 +36878,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:36645: checking for $ac_word" >&5
+echo "$as_me:36881: 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
@@ -36659,7 +36895,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:36662: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36898: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36670,10 +36906,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:36673: result: $MV" >&5
+  echo "$as_me:36909: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:36676: result: no" >&5
+  echo "$as_me:36912: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36690,32 +36926,32 @@ do
 		if test "$with_full_paths" = yes ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$cf_temp" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval cf_temp="$cf_temp"
-  case ".$cf_temp" in
-  (.NONE/*)
-    cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval cf_temp="$cf_temp"
+	case ".$cf_temp" in
+	(.NONE/*)
+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  break
-  ;;
+	break
+	;;
 esac
 
 			cf_path_prog="$cf_temp"
@@ -36732,7 +36968,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36735: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36971: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -36750,7 +36986,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:36753: checking for $ac_word" >&5
+echo "$as_me:36989: 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
@@ -36767,7 +37003,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:36770: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37006: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36778,10 +37014,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:36781: result: $GZIP" >&5
+  echo "$as_me:37017: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:36784: result: no" >&5
+  echo "$as_me:37020: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36798,32 +37034,32 @@ do
 		if test "$with_full_paths" = yes ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$cf_temp" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval cf_temp="$cf_temp"
-  case ".$cf_temp" in
-  (.NONE/*)
-    cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval cf_temp="$cf_temp"
+	case ".$cf_temp" in
+	(.NONE/*)
+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  break
-  ;;
+	break
+	;;
 esac
 
 			cf_path_prog="$cf_temp"
@@ -36840,7 +37076,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36843: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37079: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -36858,7 +37094,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:36861: checking for $ac_word" >&5
+echo "$as_me:37097: 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
@@ -36875,7 +37111,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:36878: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37114: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36886,10 +37122,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:36889: result: $UNCOMPRESS" >&5
+  echo "$as_me:37125: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:36892: result: no" >&5
+  echo "$as_me:37128: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36906,32 +37142,32 @@ do
 		if test "$with_full_paths" = yes ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$cf_temp" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval cf_temp="$cf_temp"
-  case ".$cf_temp" in
-  (.NONE/*)
-    cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval cf_temp="$cf_temp"
+	case ".$cf_temp" in
+	(.NONE/*)
+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  break
-  ;;
+	break
+	;;
 esac
 
 			cf_path_prog="$cf_temp"
@@ -36948,7 +37184,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36951: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37187: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -36966,7 +37202,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:36969: checking for $ac_word" >&5
+echo "$as_me:37205: 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
@@ -36983,7 +37219,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:36986: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37222: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36994,10 +37230,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:36997: result: $UNZIP" >&5
+  echo "$as_me:37233: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:37000: result: no" >&5
+  echo "$as_me:37236: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37014,32 +37250,32 @@ do
 		if test "$with_full_paths" = yes ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$cf_temp" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval cf_temp="$cf_temp"
-  case ".$cf_temp" in
-  (.NONE/*)
-    cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval cf_temp="$cf_temp"
+	case ".$cf_temp" in
+	(.NONE/*)
+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  break
-  ;;
+	break
+	;;
 esac
 
 			cf_path_prog="$cf_temp"
@@ -37056,7 +37292,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37059: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37295: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -37074,7 +37310,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:37077: checking for $ac_word" >&5
+echo "$as_me:37313: 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
@@ -37091,7 +37327,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:37094: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37330: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37102,10 +37338,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:37105: result: $BZIP2" >&5
+  echo "$as_me:37341: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:37108: result: no" >&5
+  echo "$as_me:37344: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37122,32 +37358,32 @@ do
 		if test "$with_full_paths" = yes ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$cf_temp" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval cf_temp="$cf_temp"
-  case ".$cf_temp" in
-  (.NONE/*)
-    cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval cf_temp="$cf_temp"
+	case ".$cf_temp" in
+	(.NONE/*)
+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  break
-  ;;
+	break
+	;;
 esac
 
 			cf_path_prog="$cf_temp"
@@ -37164,7 +37400,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37167: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37403: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -37182,7 +37418,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:37185: checking for $ac_word" >&5
+echo "$as_me:37421: 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
@@ -37199,7 +37435,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:37202: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37438: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37210,10 +37446,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:37213: result: $TAR" >&5
+  echo "$as_me:37449: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:37216: result: no" >&5
+  echo "$as_me:37452: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37230,32 +37466,32 @@ do
 		if test "$with_full_paths" = yes ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$cf_temp" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval cf_temp="$cf_temp"
-  case ".$cf_temp" in
-  (.NONE/*)
-    cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval cf_temp="$cf_temp"
+	case ".$cf_temp" in
+	(.NONE/*)
+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  break
-  ;;
+	break
+	;;
 esac
 
 			cf_path_prog="$cf_temp"
@@ -37272,7 +37508,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37275: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37511: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -37330,7 +37566,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:37333: checking for $ac_word" >&5
+echo "$as_me:37569: 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
@@ -37347,7 +37583,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:37350: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37586: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37358,10 +37594,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:37361: result: $COMPRESS" >&5
+  echo "$as_me:37597: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:37364: result: no" >&5
+  echo "$as_me:37600: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37378,32 +37614,32 @@ do
 		if test "$with_full_paths" = yes ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$cf_temp" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval cf_temp="$cf_temp"
-  case ".$cf_temp" in
-  (.NONE/*)
-    cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval cf_temp="$cf_temp"
+	case ".$cf_temp" in
+	(.NONE/*)
+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  break
-  ;;
+	break
+	;;
 esac
 
 			cf_path_prog="$cf_temp"
@@ -37420,7 +37656,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37423: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37659: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -37438,7 +37674,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:37441: checking for $ac_word" >&5
+echo "$as_me:37677: 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
@@ -37455,7 +37691,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:37458: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37694: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37466,10 +37702,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:37469: result: $RM" >&5
+  echo "$as_me:37705: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:37472: result: no" >&5
+  echo "$as_me:37708: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37486,32 +37722,32 @@ do
 		if test "$with_full_paths" = yes ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$cf_temp" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval cf_temp="$cf_temp"
-  case ".$cf_temp" in
-  (.NONE/*)
-    cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval cf_temp="$cf_temp"
+	case ".$cf_temp" in
+	(.NONE/*)
+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  break
-  ;;
+	break
+	;;
 esac
 
 			cf_path_prog="$cf_temp"
@@ -37528,7 +37764,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37531: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37767: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -37546,7 +37782,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:37549: checking for $ac_word" >&5
+echo "$as_me:37785: 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
@@ -37563,7 +37799,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:37566: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37802: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37574,10 +37810,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:37577: result: $UUDECODE" >&5
+  echo "$as_me:37813: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:37580: result: no" >&5
+  echo "$as_me:37816: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37594,32 +37830,32 @@ do
 		if test "$with_full_paths" = yes ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$cf_temp" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval cf_temp="$cf_temp"
-  case ".$cf_temp" in
-  (.NONE/*)
-    cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval cf_temp="$cf_temp"
+	case ".$cf_temp" in
+	(.NONE/*)
+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  break
-  ;;
+	break
+	;;
 esac
 
 			cf_path_prog="$cf_temp"
@@ -37636,7 +37872,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37639: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37875: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -37654,7 +37890,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:37657: checking for $ac_word" >&5
+echo "$as_me:37893: 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
@@ -37671,7 +37907,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:37674: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37910: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37682,10 +37918,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:37685: result: $ZCAT" >&5
+  echo "$as_me:37921: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:37688: result: no" >&5
+  echo "$as_me:37924: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37702,32 +37938,32 @@ do
 		if test "$with_full_paths" = yes ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$cf_temp" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval cf_temp="$cf_temp"
-  case ".$cf_temp" in
-  (.NONE/*)
-    cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval cf_temp="$cf_temp"
+	case ".$cf_temp" in
+	(.NONE/*)
+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  break
-  ;;
+	break
+	;;
 esac
 
 			cf_path_prog="$cf_temp"
@@ -37744,7 +37980,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37747: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37983: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -37762,7 +37998,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:37765: checking for $ac_word" >&5
+echo "$as_me:38001: 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
@@ -37779,7 +38015,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:37782: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38018: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37790,10 +38026,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:37793: result: $ZIP" >&5
+  echo "$as_me:38029: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:37796: result: no" >&5
+  echo "$as_me:38032: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37810,32 +38046,32 @@ do
 		if test "$with_full_paths" = yes ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$cf_temp" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval cf_temp="$cf_temp"
-  case ".$cf_temp" in
-  (.NONE/*)
-    cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval cf_temp="$cf_temp"
+	case ".$cf_temp" in
+	(.NONE/*)
+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  break
-  ;;
+	break
+	;;
 esac
 
 			cf_path_prog="$cf_temp"
@@ -37852,7 +38088,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37855: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38091: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -37880,7 +38116,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:37883: checking for $ac_word" >&5
+echo "$as_me:38119: 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
@@ -37897,7 +38133,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:37900: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38136: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37908,10 +38144,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:37911: result: $INSTALL" >&5
+  echo "$as_me:38147: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:37914: result: no" >&5
+  echo "$as_me:38150: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37928,32 +38164,32 @@ do
 		if test "$with_full_paths" = yes ; then
 
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+	cf_path_syntax="$prefix"
 else
-  cf_path_syntax="$ac_default_prefix"
+	cf_path_syntax="$ac_default_prefix"
 fi
 
 case ".$cf_temp" in
 (.\$\(*\)*|.\'*\'*)
-  ;;
+	;;
 (..|./*|.\\*)
-  ;;
+	;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
-  ;;
+	;;
 (.\${*prefix}*|.\${*dir}*)
-  eval cf_temp="$cf_temp"
-  case ".$cf_temp" in
-  (.NONE/*)
-    cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;;
+	eval cf_temp="$cf_temp"
+	case ".$cf_temp" in
+	(.NONE/*)
+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
 (.no|.NONE/*)
-  cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-  ;;
+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+	;;
 (*)
-  break
-  ;;
+	break
+	;;
 esac
 
 			cf_path_prog="$cf_temp"
@@ -37970,7 +38206,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37973: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38209: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -38000,7 +38236,7 @@ if test $cf_cv_screen = pdcurses ; then
 	case $host_os in
 	(mingw*)
 
-echo "$as_me:38003: checking for initscr in -lpdcurses" >&5
+echo "$as_me:38239: 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
@@ -38008,7 +38244,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpdcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38011 "configure"
+#line 38247 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38027,16 +38263,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38030: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38266: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38033: \$? = $ac_status" >&5
+  echo "$as_me:38269: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38272: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38039: \$? = $ac_status" >&5
+  echo "$as_me:38275: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_pdcurses_initscr=yes
 else
@@ -38047,7 +38283,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38050: result: $ac_cv_lib_pdcurses_initscr" >&5
+echo "$as_me:38286: 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
 
@@ -38069,13 +38305,13 @@ LIBS="$cf_add_libs"
 
 	cf_cv_term_header=no
 	cf_cv_unctrl_header=no
-	echo "$as_me:38072: checking for winwstr" >&5
+	echo "$as_me:38308: 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 38078 "configure"
+#line 38314 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char winwstr (); below.  */
@@ -38106,16 +38342,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:38109: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38345: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38112: \$? = $ac_status" >&5
+  echo "$as_me:38348: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38118: \$? = $ac_status" >&5
+  echo "$as_me:38354: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_winwstr=yes
 else
@@ -38125,7 +38361,7 @@ ac_cv_func_winwstr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38128: result: $ac_cv_func_winwstr" >&5
+echo "$as_me:38364: 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
@@ -38134,13 +38370,13 @@ EOF
 
 fi
 
-	echo "$as_me:38137: checking for pdcurses_dll_iname" >&5
+	echo "$as_me:38373: 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 38143 "configure"
+#line 38379 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pdcurses_dll_iname (); below.  */
@@ -38171,16 +38407,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:38174: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38410: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38177: \$? = $ac_status" >&5
+  echo "$as_me:38413: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38416: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38183: \$? = $ac_status" >&5
+  echo "$as_me:38419: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_pdcurses_dll_iname=yes
 else
@@ -38190,7 +38426,7 @@ ac_cv_func_pdcurses_dll_iname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38193: result: $ac_cv_func_pdcurses_dll_iname" >&5
+echo "$as_me:38429: 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
@@ -38203,7 +38439,7 @@ fi
 
 		;;
 	(*)
-		echo "$as_me:38206: checking for X" >&5
+		echo "$as_me:38442: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -38300,17 +38536,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 38303 "configure"
+#line 38539 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:38307: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:38543: \"$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:38313: \$? = $ac_status" >&5
+  echo "$as_me:38549: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -38343,7 +38579,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 38346 "configure"
+#line 38582 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -38355,16 +38591,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38358: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38594: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38361: \$? = $ac_status" >&5
+  echo "$as_me:38597: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38600: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38367: \$? = $ac_status" >&5
+  echo "$as_me:38603: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -38402,7 +38638,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:38405: result: $have_x" >&5
+  echo "$as_me:38641: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -38412,7 +38648,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:38415: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:38651: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -38436,11 +38672,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:38439: checking whether -R must be followed by a space" >&5
+      echo "$as_me:38675: 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 38443 "configure"
+#line 38679 "configure"
 #include "confdefs.h"
 
 int
@@ -38452,16 +38688,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38455: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38691: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38458: \$? = $ac_status" >&5
+  echo "$as_me:38694: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38697: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38464: \$? = $ac_status" >&5
+  echo "$as_me:38700: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -38471,13 +38707,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:38474: result: no" >&5
+	echo "$as_me:38710: 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 38480 "configure"
+#line 38716 "configure"
 #include "confdefs.h"
 
 int
@@ -38489,16 +38725,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38492: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38728: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38495: \$? = $ac_status" >&5
+  echo "$as_me:38731: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38498: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38501: \$? = $ac_status" >&5
+  echo "$as_me:38737: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -38508,11 +38744,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:38511: result: yes" >&5
+	  echo "$as_me:38747: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:38515: result: neither works" >&5
+	  echo "$as_me:38751: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -38532,7 +38768,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 38535 "configure"
+#line 38771 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38551,22 +38787,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38790: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38557: \$? = $ac_status" >&5
+  echo "$as_me:38793: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38563: \$? = $ac_status" >&5
+  echo "$as_me:38799: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:38569: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:38805: 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
@@ -38574,7 +38810,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38577 "configure"
+#line 38813 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38593,16 +38829,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38596: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38832: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38599: \$? = $ac_status" >&5
+  echo "$as_me:38835: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38838: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38605: \$? = $ac_status" >&5
+  echo "$as_me:38841: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -38613,14 +38849,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38616: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:38852: 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:38623: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:38859: 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
@@ -38628,7 +38864,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38631 "configure"
+#line 38867 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38647,16 +38883,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38886: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38653: \$? = $ac_status" >&5
+  echo "$as_me:38889: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38892: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38659: \$? = $ac_status" >&5
+  echo "$as_me:38895: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -38667,7 +38903,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38670: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:38906: 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"
@@ -38686,13 +38922,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:38689: checking for gethostbyname" >&5
+    echo "$as_me:38925: 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 38695 "configure"
+#line 38931 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -38723,16 +38959,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:38726: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38962: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38729: \$? = $ac_status" >&5
+  echo "$as_me:38965: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38735: \$? = $ac_status" >&5
+  echo "$as_me:38971: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -38742,11 +38978,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38745: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:38981: 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:38749: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:38985: 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
@@ -38754,7 +38990,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38757 "configure"
+#line 38993 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38773,16 +39009,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38776: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39012: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38779: \$? = $ac_status" >&5
+  echo "$as_me:39015: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38785: \$? = $ac_status" >&5
+  echo "$as_me:39021: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -38793,14 +39029,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38796: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:39032: 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:38803: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:39039: 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
@@ -38808,7 +39044,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38811 "configure"
+#line 39047 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38827,16 +39063,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38830: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39066: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38833: \$? = $ac_status" >&5
+  echo "$as_me:39069: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38839: \$? = $ac_status" >&5
+  echo "$as_me:39075: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -38847,7 +39083,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38850: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:39086: 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"
@@ -38863,13 +39099,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:38866: checking for connect" >&5
+    echo "$as_me:39102: 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 38872 "configure"
+#line 39108 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -38900,16 +39136,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:38903: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39139: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38906: \$? = $ac_status" >&5
+  echo "$as_me:39142: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39145: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38912: \$? = $ac_status" >&5
+  echo "$as_me:39148: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -38919,11 +39155,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38922: result: $ac_cv_func_connect" >&5
+echo "$as_me:39158: 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:38926: checking for connect in -lsocket" >&5
+      echo "$as_me:39162: 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
@@ -38931,7 +39167,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38934 "configure"
+#line 39170 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38950,16 +39186,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38953: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39189: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38956: \$? = $ac_status" >&5
+  echo "$as_me:39192: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39195: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38962: \$? = $ac_status" >&5
+  echo "$as_me:39198: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -38970,7 +39206,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38973: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:39209: 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"
@@ -38979,13 +39215,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:38982: checking for remove" >&5
+    echo "$as_me:39218: 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 38988 "configure"
+#line 39224 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -39016,16 +39252,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:39019: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39255: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39022: \$? = $ac_status" >&5
+  echo "$as_me:39258: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39028: \$? = $ac_status" >&5
+  echo "$as_me:39264: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -39035,11 +39271,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39038: result: $ac_cv_func_remove" >&5
+echo "$as_me:39274: 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:39042: checking for remove in -lposix" >&5
+      echo "$as_me:39278: 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
@@ -39047,7 +39283,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39050 "configure"
+#line 39286 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39066,16 +39302,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39069: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39305: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39072: \$? = $ac_status" >&5
+  echo "$as_me:39308: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39078: \$? = $ac_status" >&5
+  echo "$as_me:39314: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -39086,7 +39322,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39089: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:39325: 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"
@@ -39095,13 +39331,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:39098: checking for shmat" >&5
+    echo "$as_me:39334: 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 39104 "configure"
+#line 39340 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -39132,16 +39368,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:39135: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39371: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39138: \$? = $ac_status" >&5
+  echo "$as_me:39374: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39144: \$? = $ac_status" >&5
+  echo "$as_me:39380: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -39151,11 +39387,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39154: result: $ac_cv_func_shmat" >&5
+echo "$as_me:39390: 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:39158: checking for shmat in -lipc" >&5
+      echo "$as_me:39394: 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
@@ -39163,7 +39399,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39166 "configure"
+#line 39402 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39182,16 +39418,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39185: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39188: \$? = $ac_status" >&5
+  echo "$as_me:39424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39194: \$? = $ac_status" >&5
+  echo "$as_me:39430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -39202,7 +39438,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39205: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:39441: 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"
@@ -39220,7 +39456,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:39223: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:39459: 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
@@ -39228,7 +39464,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39231 "configure"
+#line 39467 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39247,16 +39483,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39486: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39253: \$? = $ac_status" >&5
+  echo "$as_me:39489: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39256: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39259: \$? = $ac_status" >&5
+  echo "$as_me:39495: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -39267,7 +39503,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39270: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:39506: 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"
@@ -39279,7 +39515,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:39282: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:39518: 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=
 
@@ -39290,14 +39526,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:39293: result: yes" >&5
+	echo "$as_me:39529: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39296: result: no" >&5
+	echo "$as_me:39532: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:39300: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:39536: 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=
 
@@ -39308,14 +39544,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:39311: result: yes" >&5
+	echo "$as_me:39547: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39314: result: no" >&5
+	echo "$as_me:39550: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:39318: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:39554: 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=
 
@@ -39326,14 +39562,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:39329: result: yes" >&5
+	echo "$as_me:39565: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39332: result: no" >&5
+	echo "$as_me:39568: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:39336: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:39572: 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=
 
@@ -39344,10 +39580,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:39347: result: yes" >&5
+	echo "$as_me:39583: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39350: result: no" >&5
+	echo "$as_me:39586: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -39367,17 +39603,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}:39370: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:39606: 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}:39376: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39612: 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}:39380: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39616: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39488,20 +39724,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}:39491: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:39727: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:39497: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:39733: 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 39504 "configure"
+#line 39740 "configure"
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
@@ -39517,16 +39753,16 @@ int check = XmuCompareISOLatin1("big", "small")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39520: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39756: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39523: \$? = $ac_status" >&5
+  echo "$as_me:39759: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39526: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39762: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39529: \$? = $ac_status" >&5
+  echo "$as_me:39765: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -39536,7 +39772,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39539: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:39775: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -39548,7 +39784,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:39551: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:39787: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -39556,17 +39792,17 @@ echo "${as_me:-configure}:39551: 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}:39559: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:39795: 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}:39565: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39801: 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}:39569: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39805: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39666,12 +39902,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:39669: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:39905: 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}:39674: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:39910: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -39679,12 +39915,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:39682: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:39918: 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}:39687: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:39923: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -39695,7 +39931,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}:39698: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:39934: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -39720,17 +39956,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}:39723: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:39959: 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}:39729: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39965: 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}:39733: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39969: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39831,7 +40067,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:39834: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:40070: 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
@@ -39839,7 +40075,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39842 "configure"
+#line 40078 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39858,16 +40094,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39861: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40097: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39864: \$? = $ac_status" >&5
+  echo "$as_me:40100: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39870: \$? = $ac_status" >&5
+  echo "$as_me:40106: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -39878,7 +40114,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39881: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:40117: 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
 
@@ -39914,17 +40150,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}:39917: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:40153: 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}:39923: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40159: 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}:39927: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40163: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40024,24 +40260,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40027: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:40263: 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}:40034: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:40270: 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}:40040: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40276: 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}:40044: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40280: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40141,24 +40377,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40144: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:40380: 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}:40151: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:40387: 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}:40157: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40393: 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}:40161: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40397: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40258,24 +40494,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40261: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:40497: 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}:40268: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:40504: 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}:40274: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40510: 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}:40278: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40514: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40375,7 +40611,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40378: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:40614: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -40386,17 +40622,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}:40389: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:40625: 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}:40395: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40631: 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}:40399: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40635: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40497,14 +40733,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:40500: checking for usable X dependency" >&5
+echo "$as_me:40736: 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 40507 "configure"
+#line 40743 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -40523,16 +40759,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40526: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40762: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40529: \$? = $ac_status" >&5
+  echo "$as_me:40765: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40535: \$? = $ac_status" >&5
+  echo "$as_me:40771: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -40542,30 +40778,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40545: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:40781: 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}:40551: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:40787: 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}:40558: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:40794: 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}:40564: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40800: 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}:40568: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40804: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40668,12 +40904,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:40671: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:40907: 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}:40676: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:40912: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -40681,14 +40917,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:40684: checking for usable X Toolkit package" >&5
+echo "$as_me:40920: 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 40691 "configure"
+#line 40927 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
@@ -40703,16 +40939,16 @@ int num = IceConnectionNumber(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40706: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40942: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40709: \$? = $ac_status" >&5
+  echo "$as_me:40945: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40948: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40715: \$? = $ac_status" >&5
+  echo "$as_me:40951: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -40722,7 +40958,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40725: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:40961: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -40736,22 +40972,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}:40739: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:40975: 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}:40744: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:40980: 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}:40750: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40986: 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}:40754: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40990: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40850,17 +41086,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}:40853: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:41089: 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}:40859: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41095: 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}:40863: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41099: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40969,12 +41205,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:40972: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:41208: 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}:40977: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:41213: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -40994,7 +41230,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:40997: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41233: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -41065,7 +41301,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}:41068: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:41304: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -41073,7 +41309,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}:41076: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:41312: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -41081,14 +41317,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}:41084: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:41320: 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 41091 "configure"
+#line 41327 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41100,16 +41336,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41103: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41339: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41106: \$? = $ac_status" >&5
+  echo "$as_me:41342: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41112: \$? = $ac_status" >&5
+  echo "$as_me:41348: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -41117,12 +41353,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:41120: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41356: 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}:41125: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:41361: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -41130,13 +41366,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-	echo "$as_me:41133: checking for XOpenDisplay" >&5
+	echo "$as_me:41369: 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 41139 "configure"
+#line 41375 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -41167,16 +41403,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:41170: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41406: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41173: \$? = $ac_status" >&5
+  echo "$as_me:41409: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41179: \$? = $ac_status" >&5
+  echo "$as_me:41415: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -41186,13 +41422,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:41189: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:41425: 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:41195: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:41431: 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
@@ -41200,7 +41436,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 41203 "configure"
+#line 41439 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -41219,16 +41455,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41222: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41458: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41225: \$? = $ac_status" >&5
+  echo "$as_me:41461: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41464: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41231: \$? = $ac_status" >&5
+  echo "$as_me:41467: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -41239,7 +41475,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:41242: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:41478: 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
 
@@ -41263,13 +41499,13 @@ fi
 
 fi
 
-	echo "$as_me:41266: checking for XtAppInitialize" >&5
+	echo "$as_me:41502: 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 41272 "configure"
+#line 41508 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -41300,16 +41536,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:41303: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41539: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41306: \$? = $ac_status" >&5
+  echo "$as_me:41542: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41312: \$? = $ac_status" >&5
+  echo "$as_me:41548: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -41319,13 +41555,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:41322: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:41558: 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:41328: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:41564: 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
@@ -41333,7 +41569,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 41336 "configure"
+#line 41572 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -41352,16 +41588,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41355: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41591: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41358: \$? = $ac_status" >&5
+  echo "$as_me:41594: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41597: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41364: \$? = $ac_status" >&5
+  echo "$as_me:41600: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -41372,7 +41608,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:41375: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:41611: 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
 
@@ -41389,7 +41625,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:41392: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:41628: 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
@@ -41411,14 +41647,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:41414: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:41650: 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:41417: checking for $cf_test" >&5
+			echo "$as_me:41653: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 41421 "configure"
+#line 41657 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -41432,16 +41668,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:41435: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41671: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41438: \$? = $ac_status" >&5
+  echo "$as_me:41674: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:41441: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41677: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41444: \$? = $ac_status" >&5
+  echo "$as_me:41680: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -41450,7 +41686,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:41453: result: $cf_result" >&5
+		echo "$as_me:41689: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_inc=$cf_path
@@ -41462,7 +41698,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:41465: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:41701: 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"
@@ -41508,7 +41744,7 @@ do
 done
 LIBS="$cf_add_libs"
 
-				echo "$as_me:41511: checking for $cf_libs in $cf_path" >&5
+				echo "$as_me:41747: checking for $cf_libs in $cf_path" >&5
 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
 			else
 
@@ -41528,11 +41764,11 @@ do
 done
 LIBS="$cf_add_libs"
 
-				echo "$as_me:41531: checking for $cf_test in $cf_libs" >&5
+				echo "$as_me:41767: 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 41535 "configure"
+#line 41771 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -41548,16 +41784,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41551: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41787: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41554: \$? = $ac_status" >&5
+  echo "$as_me:41790: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41793: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41560: \$? = $ac_status" >&5
+  echo "$as_me:41796: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -41566,7 +41802,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:41569: result: $cf_result" >&5
+			echo "$as_me:41805: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_libs"
@@ -41580,7 +41816,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:41583: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:41819: 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
@@ -41598,7 +41834,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:41601: checking for $ac_word" >&5
+echo "$as_me:41837: 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
@@ -41613,7 +41849,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:41616: found $ac_dir/$ac_word" >&5
+echo "$as_me:41852: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -41621,10 +41857,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:41624: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:41860: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:41627: result: no" >&5
+  echo "$as_me:41863: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -41637,7 +41873,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:41640: checking for $ac_word" >&5
+echo "$as_me:41876: 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
@@ -41652,7 +41888,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:41655: found $ac_dir/$ac_word" >&5
+echo "$as_me:41891: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -41660,10 +41896,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:41663: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:41899: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:41666: result: no" >&5
+  echo "$as_me:41902: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -41702,7 +41938,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:41705: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41941: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -41773,7 +42009,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}:41776: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:42012: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -41781,7 +42017,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}:41784: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:42020: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -41789,14 +42025,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}:41792: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:42028: 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 41799 "configure"
+#line 42035 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41808,16 +42044,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41811: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42047: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41814: \$? = $ac_status" >&5
+  echo "$as_me:42050: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41820: \$? = $ac_status" >&5
+  echo "$as_me:42056: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -41825,12 +42061,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:41828: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:42064: 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}:41833: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:42069: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -41838,7 +42074,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:41841: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:42077: 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
@@ -41846,7 +42082,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 41849 "configure"
+#line 42085 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -41865,16 +42101,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41868: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42104: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41871: \$? = $ac_status" >&5
+  echo "$as_me:42107: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41877: \$? = $ac_status" >&5
+  echo "$as_me:42113: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -41885,7 +42121,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:41888: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:42124: 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
 
@@ -41907,7 +42143,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:41910: checking for XCurses library" >&5
+echo "$as_me:42146: 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
@@ -41930,7 +42166,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 41933 "configure"
+#line 42169 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -41945,16 +42181,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41948: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42184: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41951: \$? = $ac_status" >&5
+  echo "$as_me:42187: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41954: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41957: \$? = $ac_status" >&5
+  echo "$as_me:42193: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -41965,7 +42201,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:41968: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:42204: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -41980,23 +42216,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:41983: checking for xcurses.h" >&5
+	echo "$as_me:42219: 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 41989 "configure"
+#line 42225 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:41993: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42229: \"$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:41999: \$? = $ac_status" >&5
+  echo "$as_me:42235: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42015,7 +42251,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:42018: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:42254: 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
 
@@ -42026,7 +42262,7 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:42029: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:42265: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -42035,7 +42271,7 @@ fi
 	esac
 else
 
-echo "$as_me:42038: checking if we can include termio.h with curses" >&5
+echo "$as_me:42274: 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
@@ -42045,7 +42281,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 42048 "configure"
+#line 42284 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -42059,16 +42295,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42062: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42298: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42065: \$? = $ac_status" >&5
+  echo "$as_me:42301: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42071: \$? = $ac_status" >&5
+  echo "$as_me:42307: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -42081,7 +42317,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:42084: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:42320: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test $cf_cv_termio_and_curses = yes &&
@@ -42098,23 +42334,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:42101: checking for $ac_header" >&5
+echo "$as_me:42337: 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 42107 "configure"
+#line 42343 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:42111: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42347: \"$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:42117: \$? = $ac_status" >&5
+  echo "$as_me:42353: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42133,7 +42369,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:42136: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:42372: 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
@@ -42145,7 +42381,7 @@ done
 
 	fi
 
-echo "$as_me:42148: checking if curses supports alternate-character set" >&5
+echo "$as_me:42384: 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
@@ -42154,7 +42390,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 42157 "configure"
+#line 42393 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42168,16 +42404,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42171: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42407: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42174: \$? = $ac_status" >&5
+  echo "$as_me:42410: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42180: \$? = $ac_status" >&5
+  echo "$as_me:42416: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -42191,21 +42427,21 @@ done
 
 fi
 
-echo "$as_me:42194: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:42430: 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:42201: checking if curses supports fancy attributes" >&5
+echo "$as_me:42437: 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 42208 "configure"
+#line 42444 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42223,16 +42459,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42226: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42462: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42229: \$? = $ac_status" >&5
+  echo "$as_me:42465: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42235: \$? = $ac_status" >&5
+  echo "$as_me:42471: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -42244,14 +42480,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:42247: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:42483: 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:42254: checking for function curses_version" >&5
+echo "$as_me:42490: 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
@@ -42261,7 +42497,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 42264 "configure"
+#line 42500 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42274,15 +42510,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:42277: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42513: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42280: \$? = $ac_status" >&5
+  echo "$as_me:42516: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:42282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42285: \$? = $ac_status" >&5
+  echo "$as_me:42521: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -42297,7 +42533,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:42300: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:42536: 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
@@ -42305,14 +42541,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:42308: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:42544: 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 42315 "configure"
+#line 42551 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42331,16 +42567,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42334: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42570: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42337: \$? = $ac_status" >&5
+  echo "$as_me:42573: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42343: \$? = $ac_status" >&5
+  echo "$as_me:42579: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -42352,10 +42588,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:42355: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:42591: 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:42358: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:42594: 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
@@ -42365,14 +42601,14 @@ EOF
 fi
 fi
 
-echo "$as_me:42368: checking if curses supports color attributes" >&5
+echo "$as_me:42604: 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 42375 "configure"
+#line 42611 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42392,16 +42628,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42395: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42631: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42398: \$? = $ac_status" >&5
+  echo "$as_me:42634: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42401: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42637: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42404: \$? = $ac_status" >&5
+  echo "$as_me:42640: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -42413,7 +42649,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:42416: result: $cf_cv_color_curses" >&5
+echo "$as_me:42652: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test $cf_cv_color_curses = yes ; then
 
@@ -42435,23 +42671,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:42438: checking for $ac_header" >&5
+echo "$as_me:42674: 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 42444 "configure"
+#line 42680 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:42448: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42684: \"$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:42454: \$? = $ac_status" >&5
+  echo "$as_me:42690: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42470,7 +42706,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:42473: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:42709: 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
@@ -42485,23 +42721,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:42488: checking for $ac_header" >&5
+echo "$as_me:42724: 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 42494 "configure"
+#line 42730 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:42498: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42734: \"$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:42504: \$? = $ac_status" >&5
+  echo "$as_me:42740: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42520,7 +42756,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:42523: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:42759: 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
@@ -42538,10 +42774,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:42541: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:42777: 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 42544 "configure"
+#line 42780 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -42553,16 +42789,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42556: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42792: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42559: \$? = $ac_status" >&5
+  echo "$as_me:42795: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42798: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42565: \$? = $ac_status" >&5
+  echo "$as_me:42801: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -42570,7 +42806,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 42573 "configure"
+#line 42809 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -42584,16 +42820,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42587: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42823: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42590: \$? = $ac_status" >&5
+  echo "$as_me:42826: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42829: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42596: \$? = $ac_status" >&5
+  echo "$as_me:42832: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -42609,27 +42845,27 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:42612: result: $termios_bad" >&5
+	echo "$as_me:42848: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:42617: checking declaration of size-change" >&5
+echo "$as_me:42853: 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
 else
 
-    cf_cv_sizechange=unknown
-    cf_save_CPPFLAGS="$CPPFLAGS"
+	cf_cv_sizechange=unknown
+	cf_save_CPPFLAGS="$CPPFLAGS"
 
 for cf_opts in "" "NEED_PTEM_H"
 do
 
-    CPPFLAGS="$cf_save_CPPFLAGS"
-    test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
-    cat >conftest.$ac_ext <<_ACEOF
-#line 42632 "configure"
+	CPPFLAGS="$cf_save_CPPFLAGS"
+	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
+	cat >conftest.$ac_ext <<_ACEOF
+#line 42868 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -42673,16 +42909,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42676: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42912: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42679: \$? = $ac_status" >&5
+  echo "$as_me:42915: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42685: \$? = $ac_status" >&5
+  echo "$as_me:42921: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -42701,7 +42937,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:42704: result: $cf_cv_sizechange" >&5
+echo "$as_me:42940: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -42719,14 +42955,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:42722: checking if ttytype is declared in curses library" >&5
+echo "$as_me:42958: 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 42729 "configure"
+#line 42965 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -42738,16 +42974,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42741: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42977: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42744: \$? = $ac_status" >&5
+  echo "$as_me:42980: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42750: \$? = $ac_status" >&5
+  echo "$as_me:42986: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -42759,7 +42995,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:42762: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:42998: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test $cf_cv_have_ttytype = yes &&
 cat >>confdefs.h <<\EOF
@@ -42768,14 +43004,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:42771: checking if curses supports wide characters" >&5
+echo "$as_me:43007: 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 42778 "configure"
+#line 43014 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -42794,16 +43030,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42797: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43033: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42800: \$? = $ac_status" >&5
+  echo "$as_me:43036: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42806: \$? = $ac_status" >&5
+  echo "$as_me:43042: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -42814,7 +43050,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:42817: result: $cf_cv_widec_curses" >&5
+echo "$as_me:43053: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -42824,14 +43060,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:42827: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:43063: 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 42834 "configure"
+#line 43070 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -42845,23 +43081,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42848: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43084: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42851: \$? = $ac_status" >&5
+  echo "$as_me:43087: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43090: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42857: \$? = $ac_status" >&5
+  echo "$as_me:43093: \$? = $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 42864 "configure"
+#line 43100 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -42876,16 +43112,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42879: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43115: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42882: \$? = $ac_status" >&5
+  echo "$as_me:43118: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42888: \$? = $ac_status" >&5
+  echo "$as_me:43124: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -42897,7 +43133,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:42900: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:43136: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -42920,14 +43156,14 @@ fi
 
 	fi
 
-echo "$as_me:42923: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:43159: 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 42930 "configure"
+#line 43166 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -42949,23 +43185,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42952: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43188: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42955: \$? = $ac_status" >&5
+  echo "$as_me:43191: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43194: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42961: \$? = $ac_status" >&5
+  echo "$as_me:43197: \$? = $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 42968 "configure"
+#line 43204 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -42987,16 +43223,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42990: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43226: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42993: \$? = $ac_status" >&5
+  echo "$as_me:43229: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42999: \$? = $ac_status" >&5
+  echo "$as_me:43235: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -43008,11 +43244,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:43011: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:43247: 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:43015: checking for term.h" >&5
+echo "$as_me:43251: 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
@@ -43033,7 +43269,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43036 "configure"
+#line 43272 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43047,16 +43283,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43050: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43286: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43053: \$? = $ac_status" >&5
+  echo "$as_me:43289: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43059: \$? = $ac_status" >&5
+  echo "$as_me:43295: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -43075,7 +43311,7 @@ case $cf_cv_term_header in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 43078 "configure"
+#line 43314 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43093,16 +43329,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43096: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43332: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43099: \$? = $ac_status" >&5
+  echo "$as_me:43335: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43105: \$? = $ac_status" >&5
+  echo "$as_me:43341: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -43117,7 +43353,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 esac
 
 fi
-echo "$as_me:43120: result: $cf_cv_term_header" >&5
+echo "$as_me:43356: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in
@@ -43144,7 +43380,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:43147: checking for unctrl.h" >&5
+echo "$as_me:43383: 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
@@ -43165,7 +43401,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43168 "configure"
+#line 43404 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43179,16 +43415,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43182: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43418: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43185: \$? = $ac_status" >&5
+  echo "$as_me:43421: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43424: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43191: \$? = $ac_status" >&5
+  echo "$as_me:43427: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -43201,12 +43437,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:43204: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:43440: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case $cf_cv_unctrl_header in
 (no)
-	{ echo "$as_me:43209: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:43445: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -43262,10 +43498,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:43265: checking for ${cf_func}" >&5
+	echo "$as_me:43501: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:43268: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:43504: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43274,7 +43510,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 43277 "configure"
+#line 43513 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -43307,16 +43543,16 @@ if (foo + 1234 > 5678)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43310: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43546: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43313: \$? = $ac_status" >&5
+  echo "$as_me:43549: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43319: \$? = $ac_status" >&5
+  echo "$as_me:43555: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -43332,7 +43568,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:43335: result: $cf_result" >&5
+	echo "$as_me:43571: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -43348,13 +43584,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:43351: checking for $ac_func" >&5
+echo "$as_me:43587: 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 43357 "configure"
+#line 43593 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -43385,16 +43621,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:43388: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43624: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43391: \$? = $ac_status" >&5
+  echo "$as_me:43627: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43397: \$? = $ac_status" >&5
+  echo "$as_me:43633: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -43404,7 +43640,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:43407: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:43643: 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
@@ -43418,12 +43654,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:43421: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:43657: 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:43426: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:43662: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -43431,7 +43667,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:43434: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:43670: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 
@@ -43445,7 +43681,7 @@ fi
 # use rpath for libraries in unusual places
 
 LD_RPATH_OPT=
-echo "$as_me:43448: checking for an rpath option" >&5
+echo "$as_me:43684: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 case $cf_cv_system_name in
 (irix*)
@@ -43476,12 +43712,12 @@ case $cf_cv_system_name in
 (*)
 	;;
 esac
-echo "$as_me:43479: result: $LD_RPATH_OPT" >&5
+echo "$as_me:43715: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 case "x$LD_RPATH_OPT" in
 (x-R*)
-	echo "$as_me:43484: checking if we need a space after rpath option" >&5
+	echo "$as_me:43720: 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"
 
@@ -43502,7 +43738,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43505 "configure"
+#line 43741 "configure"
 #include "confdefs.h"
 
 int
@@ -43514,16 +43750,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43517: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43753: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43520: \$? = $ac_status" >&5
+  echo "$as_me:43756: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43526: \$? = $ac_status" >&5
+  echo "$as_me:43762: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
@@ -43533,13 +43769,13 @@ cf_rpath_space=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	LIBS="$cf_save_LIBS"
-	echo "$as_me:43536: result: $cf_rpath_space" >&5
+	echo "$as_me:43772: 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:43542: checking if rpath-hack should be disabled" >&5
+echo "$as_me:43778: 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.
@@ -43556,21 +43792,21 @@ else
   cf_disable_rpath_hack=no
 
 fi;
-echo "$as_me:43559: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:43795: 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:43563: checking for updated LDFLAGS" >&5
+echo "$as_me:43799: 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:43566: result: maybe" >&5
+	echo "$as_me:43802: 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:43573: checking for $ac_word" >&5
+echo "$as_me:43809: 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
@@ -43585,7 +43821,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:43588: found $ac_dir/$ac_word" >&5
+echo "$as_me:43824: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -43593,10 +43829,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:43596: result: $cf_ldd_prog" >&5
+  echo "$as_me:43832: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:43599: result: no" >&5
+  echo "$as_me:43835: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43610,7 +43846,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 43613 "configure"
+#line 43849 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -43622,16 +43858,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43861: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43628: \$? = $ac_status" >&5
+  echo "$as_me:43864: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43634: \$? = $ac_status" >&5
+  echo "$as_me:43870: \$? = $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`
@@ -43659,7 +43895,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}:43662: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:43898: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -43671,11 +43907,11 @@ echo "${as_me:-configure}:43662: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:43674: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43910: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:43678: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43914: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -43712,7 +43948,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:43715: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:43951: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -43725,11 +43961,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:43728: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43964: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:43732: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:43968: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -43766,7 +44002,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:43769: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:44005: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -43779,14 +44015,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:43782: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:44018: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:43786: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:44022: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:43789: result: no" >&5
+	echo "$as_me:44025: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43887,7 +44123,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:43890: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:44126: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -44063,7 +44299,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:44066: error: ambiguous option: $1
+    { { echo "$as_me:44302: 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;}
@@ -44082,7 +44318,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:44085: error: unrecognized option: $1
+  -*) { { echo "$as_me:44321: 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;}
@@ -44135,7 +44371,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:44138: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:44374: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -44469,7 +44705,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:44472: creating $ac_file" >&5
+    { echo "$as_me:44708: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -44487,7 +44723,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:44490: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:44726: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -44500,7 +44736,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:44503: error: cannot find input file: $f" >&5
+           { { echo "$as_me:44739: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -44516,7 +44752,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:44519: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:44755: 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;}
@@ -44525,7 +44761,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' $ac_item`
       if test -n "$ac_seen"; then
-        { echo "$as_me:44528: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:44764: 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;}
@@ -44562,7 +44798,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:44565: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:44801: 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;}
@@ -44573,7 +44809,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:44576: WARNING: Some variables may not be substituted:
+      { echo "$as_me:44812: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -44622,7 +44858,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:44625: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:44861: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -44633,7 +44869,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:44636: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:44872: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -44646,7 +44882,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:44649: error: cannot find input file: $f" >&5
+           { { echo "$as_me:44885: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -44764,7 +45000,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:44767: $ac_file is unchanged" >&5
+      { echo "$as_me:45003: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \