Import lukemftp-1.6-beta2.

1 files changed, 299 insertions, 199 deletions

diff --git a/contrib/lukemftp/configure b/contrib/lukemftp/configure
index b1d179d..f759085 100755
--- a/contrib/lukemftp/configure
+++ b/contrib/lukemftp/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.31 
+# From configure.in Revision: 1.37 
 
 
 
@@ -2148,6 +2148,12 @@ EOF
 
     fi
 
+if test -n "$socks"; then
+	if test $opt_ipv6 = yes; then
+		echo "IPv6 is incompatible with socks, disabling IPv6 support"
+		opt_ipv6=no
+	fi
+fi
 
 
 
@@ -2156,12 +2162,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:2160: checking for $ac_hdr that defines DIR" >&5
+echo "configure:2166: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2165 "configure"
+#line 2171 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -2169,7 +2175,7 @@ int main() {
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:2173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -2194,7 +2200,7 @@ done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:2198: checking for opendir in -ldir" >&5
+echo "configure:2204: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2202,7 +2208,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2206 "configure"
+#line 2212 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2213,7 +2219,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:2217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2235,7 +2241,7 @@ fi
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:2239: checking for opendir in -lx" >&5
+echo "configure:2245: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2243,7 +2249,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2247 "configure"
+#line 2253 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2254,7 +2260,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:2258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2277,12 +2283,12 @@ fi
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2281: checking for ANSI C header files" >&5
+echo "configure:2287: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2286 "configure"
+#line 2292 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2290,7 +2296,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2307,7 +2313,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2311 "configure"
+#line 2317 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2325,7 +2331,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 <<EOF
-#line 2329 "configure"
+#line 2335 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2346,7 +2352,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2350 "configure"
+#line 2356 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2357,7 +2363,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2380,21 +2386,22 @@ EOF
 
 fi
 
-for ac_hdr in err.h regex.h paths.h poll.h sys/poll.h termcap.h util.h vis.h
+for ac_hdr in arpa/nameser.h err.h regex.h paths.h poll.h sys/poll.h \
+		termcap.h util.h libutil.h vis.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2388: checking for $ac_hdr" >&5
+echo "configure:2395: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2393 "configure"
+#line 2400 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2423,12 +2430,12 @@ done
 
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2427: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2434: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2432 "configure"
+#line 2439 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -2437,7 +2444,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:2441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -2458,12 +2465,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2462: checking for off_t" >&5
+echo "configure:2469: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2467 "configure"
+#line 2474 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2491,7 +2498,7 @@ EOF
 fi
 
 echo $ac_n "checking size of off_t""... $ac_c" 1>&6
-echo "configure:2495: checking size of off_t" >&5
+echo "configure:2502: checking size of off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2499,7 +2506,7 @@ else
   ac_cv_sizeof_off_t=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 2503 "configure"
+#line 2510 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2510,7 +2517,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:2514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_off_t=`cat conftestval`
 else
@@ -2531,13 +2538,13 @@ EOF
 
 
 	echo $ac_n "checking for long long""... $ac_c" 1>&6
-echo "configure:2535: checking for long long" >&5
+echo "configure:2542: checking for long long" >&5
 if eval "test \"`echo '$''{'ftp_cv_HAVE_LONG_LONG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 2541 "configure"
+#line 2548 "configure"
 #include "confdefs.h"
  
 #include <sys/types.h>  
@@ -2547,7 +2554,7 @@ long long X = 2, Y = 1, Z;
 Z = X / Y; ; 
 ; return 0; }
 EOF
-if { (eval echo configure:2551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    ftp_cv_HAVE_LONG_LONG=yes 
 else
@@ -2576,13 +2583,13 @@ have_long_long=yes
 
 
 	echo $ac_n "checking for in_port_t""... $ac_c" 1>&6
-echo "configure:2580: checking for in_port_t" >&5
+echo "configure:2587: checking for in_port_t" >&5
 if eval "test \"`echo '$''{'ftp_cv_HAVE_IN_PORT_T'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 2586 "configure"
+#line 2593 "configure"
 #include "confdefs.h"
  
 #include <sys/types.h>
@@ -2591,7 +2598,7 @@ int main() {
   in_port_t X ; 
 ; return 0; }
 EOF
-if { (eval echo configure:2595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_IN_PORT_T=yes 
 else
@@ -2617,14 +2624,56 @@ EOF
 
 
 
+	echo $ac_n "checking for sa_family_t""... $ac_c" 1>&6
+echo "configure:2629: checking for sa_family_t" >&5
+if eval "test \"`echo '$''{'ftp_cv_HAVE_SA_FAMILY_T'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+		cat > conftest.$ac_ext <<EOF
+#line 2635 "configure"
+#include "confdefs.h"
+ 
+#include <sys/types.h>
+#include <sys/socket.h>  
+int main() {
+  sa_family_t X ; 
+; return 0; }
+EOF
+if { (eval echo configure:2644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+   ftp_cv_HAVE_SA_FAMILY_T=yes 
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+   ftp_cv_HAVE_SA_FAMILY_T=no 
+fi
+rm -f conftest*
+	
+fi
+
+echo "$ac_t""$ftp_cv_HAVE_SA_FAMILY_T" 1>&6
+	if test "x$ftp_cv_HAVE_SA_FAMILY_T" = "xyes"; then
+		cat >> confdefs.h <<\EOF
+#define HAVE_SA_FAMILY_T 1
+EOF
+
+	else
+		
+		:
+	fi
+
+
+
 	echo $ac_n "checking for sockaddr_in.sin_len""... $ac_c" 1>&6
-echo "configure:2622: checking for sockaddr_in.sin_len" >&5
+echo "configure:2671: checking for sockaddr_in.sin_len" >&5
 if eval "test \"`echo '$''{'ftp_cv_HAVE_SOCKADDR_SA_LEN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 2628 "configure"
+#line 2677 "configure"
 #include "confdefs.h"
  
 #include <sys/types.h>
@@ -2636,7 +2685,7 @@ int main() {
 	int X = sin.sin_len ; 
 ; return 0; }
 EOF
-if { (eval echo configure:2640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_SOCKADDR_SA_LEN=yes 
 else
@@ -2663,13 +2712,13 @@ EOF
 
 
 	echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:2667: checking for socklen_t" >&5
+echo "configure:2716: checking for socklen_t" >&5
 if eval "test \"`echo '$''{'ftp_cv_HAVE_SOCKLEN_T'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 2673 "configure"
+#line 2722 "configure"
 #include "confdefs.h"
  
 #include <sys/types.h>
@@ -2678,7 +2727,7 @@ int main() {
   socklen_t X ; 
 ; return 0; }
 EOF
-if { (eval echo configure:2682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_SOCKLEN_T=yes 
 else
@@ -2707,13 +2756,13 @@ if test $opt_ipv6 = yes; then
 
 	
 	echo $ac_n "checking for AF_INET6""... $ac_c" 1>&6
-echo "configure:2711: checking for AF_INET6" >&5
+echo "configure:2760: checking for AF_INET6" >&5
 if eval "test \"`echo '$''{'ftp_cv_HAVE_AF_INET6'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 2717 "configure"
+#line 2766 "configure"
 #include "confdefs.h"
  
 #include <sys/types.h>
@@ -2722,7 +2771,7 @@ int main() {
   int X = AF_INET6 ; 
 ; return 0; }
 EOF
-if { (eval echo configure:2726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_AF_INET6=yes 
 else
@@ -2749,13 +2798,13 @@ EOF
 
 	
 	echo $ac_n "checking for struct sockaddr_in6""... $ac_c" 1>&6
-echo "configure:2753: checking for struct sockaddr_in6" >&5
+echo "configure:2802: checking for struct sockaddr_in6" >&5
 if eval "test \"`echo '$''{'ftp_cv_HAVE_SOCKADDR_IN6'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 2759 "configure"
+#line 2808 "configure"
 #include "confdefs.h"
  
 #include <sys/types.h>
@@ -2764,7 +2813,7 @@ int main() {
   struct sockaddr_in6 X ; 
 ; return 0; }
 EOF
-if { (eval echo configure:2768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_SOCKADDR_IN6=yes 
 else
@@ -2793,13 +2842,13 @@ fi
 
 
 	echo $ac_n "checking for struct addrinfo""... $ac_c" 1>&6
-echo "configure:2797: checking for struct addrinfo" >&5
+echo "configure:2846: checking for struct addrinfo" >&5
 if eval "test \"`echo '$''{'ftp_cv_HAVE_ADDRINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 2803 "configure"
+#line 2852 "configure"
 #include "confdefs.h"
  
 #include <sys/types.h>
@@ -2809,7 +2858,7 @@ int main() {
   struct addrinfo X ; 
 ; return 0; }
 EOF
-if { (eval echo configure:2813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_ADDRINFO=yes 
 else
@@ -2836,13 +2885,13 @@ EOF
 
 
 	echo $ac_n "checking for d_namlen in struct dirent""... $ac_c" 1>&6
-echo "configure:2840: checking for d_namlen in struct dirent" >&5
+echo "configure:2889: checking for d_namlen in struct dirent" >&5
 if eval "test \"`echo '$''{'ftp_cv_HAVE_D_NAMLEN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 2846 "configure"
+#line 2895 "configure"
 #include "confdefs.h"
  
 #if HAVE_DIRENT_H
@@ -2865,7 +2914,7 @@ int main() {
 	int X = dp.d_namlen; ; 
 ; return 0; }
 EOF
-if { (eval echo configure:2869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_D_NAMLEN=yes 
 else
@@ -2891,52 +2940,14 @@ EOF
 
 
 
-	echo $ac_n "checking for GLOB_BRACE""... $ac_c" 1>&6
-echo "configure:2896: checking for GLOB_BRACE" >&5
-if eval "test \"`echo '$''{'ftp_cv_have_glob_brace'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-		cat > conftest.$ac_ext <<EOF
-#line 2902 "configure"
-#include "confdefs.h"
- 
-#include <glob.h>  
-int main() {
-  int X = GLOB_BRACE ; 
-; return 0; }
-EOF
-if { (eval echo configure:2910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-   ftp_cv_have_glob_brace=yes 
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-   ftp_cv_have_glob_brace=no 
-fi
-rm -f conftest*
-	
-fi
-
-echo "$ac_t""$ftp_cv_have_glob_brace" 1>&6
-	if test "x$ftp_cv_have_glob_brace" = "xyes"; then
-		:
-	else
-		
-		:
-	fi
-
-
-
 	echo $ac_n "checking for h_errno declaration""... $ac_c" 1>&6
-echo "configure:2934: checking for h_errno declaration" >&5
+echo "configure:2945: checking for h_errno declaration" >&5
 if eval "test \"`echo '$''{'ftp_cv_HAVE_H_ERRNO_D'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 2940 "configure"
+#line 2951 "configure"
 #include "confdefs.h"
  
 #include <netdb.h>  
@@ -2944,7 +2955,7 @@ int main() {
   int X = h_errno ; 
 ; return 0; }
 EOF
-if { (eval echo configure:2948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_H_ERRNO_D=yes 
 else
@@ -2971,13 +2982,13 @@ EOF
 
 
 	echo $ac_n "checking for fclose() declaration""... $ac_c" 1>&6
-echo "configure:2975: checking for fclose() declaration" >&5
+echo "configure:2986: checking for fclose() declaration" >&5
 if eval "test \"`echo '$''{'ftp_cv_HAVE_FCLOSE_D'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 2981 "configure"
+#line 2992 "configure"
 #include "confdefs.h"
  
 #include <stdio.h>  
@@ -2985,7 +2996,7 @@ int main() {
   int (*X)() = fclose ; 
 ; return 0; }
 EOF
-if { (eval echo configure:2989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_FCLOSE_D=yes 
 else
@@ -3012,13 +3023,13 @@ EOF
 
 
 	echo $ac_n "checking for getpass() declaration""... $ac_c" 1>&6
-echo "configure:3016: checking for getpass() declaration" >&5
+echo "configure:3027: checking for getpass() declaration" >&5
 if eval "test \"`echo '$''{'ftp_cv_HAVE_GETPASS_D'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3022 "configure"
+#line 3033 "configure"
 #include "confdefs.h"
  
 #include <stdlib.h>
@@ -3027,7 +3038,7 @@ int main() {
   char *(*X)() = getpass ; 
 ; return 0; }
 EOF
-if { (eval echo configure:3031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_GETPASS_D=yes 
 else
@@ -3055,13 +3066,13 @@ EOF
 
 
 	echo $ac_n "checking for optarg declaration""... $ac_c" 1>&6
-echo "configure:3059: checking for optarg declaration" >&5
+echo "configure:3070: checking for optarg declaration" >&5
 if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTARG_D'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3065 "configure"
+#line 3076 "configure"
 #include "confdefs.h"
  
 #include <stdlib.h>
@@ -3070,7 +3081,7 @@ int main() {
   char *X = optarg ; 
 ; return 0; }
 EOF
-if { (eval echo configure:3074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_OPTARG_D=yes 
 else
@@ -3097,13 +3108,13 @@ EOF
 
 
 	echo $ac_n "checking for optind declaration""... $ac_c" 1>&6
-echo "configure:3101: checking for optind declaration" >&5
+echo "configure:3112: checking for optind declaration" >&5
 if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTIND_D'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3107 "configure"
+#line 3118 "configure"
 #include "confdefs.h"
  
 #include <stdlib.h>
@@ -3112,7 +3123,7 @@ int main() {
   int X = optind ; 
 ; return 0; }
 EOF
-if { (eval echo configure:3116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_OPTIND_D=yes 
 else
@@ -3139,13 +3150,13 @@ EOF
 
 
 	echo $ac_n "checking for pclose() declaration""... $ac_c" 1>&6
-echo "configure:3143: checking for pclose() declaration" >&5
+echo "configure:3154: checking for pclose() declaration" >&5
 if eval "test \"`echo '$''{'ftp_cv_HAVE_PCLOSE_D'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3149 "configure"
+#line 3160 "configure"
 #include "confdefs.h"
  
 #include <stdio.h>  
@@ -3153,7 +3164,7 @@ int main() {
   int (*X)() = pclose ; 
 ; return 0; }
 EOF
-if { (eval echo configure:3157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3168: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_PCLOSE_D=yes 
 else
@@ -3179,17 +3190,17 @@ EOF
 
 
 
-for ac_func in err fgetln fparseln getaddrinfo getnameinfo glob inet_ntop \
-		inet_pton mkstemp sl_init snprintf strdup strerror strlcat \
+for ac_func in err fgetln fseeko getaddrinfo getnameinfo inet_ntop inet_pton \
+		mkstemp setprogname sl_init snprintf strdup strerror strlcat \
 		strlcpy strptime strsep strunvis strvis timegm usleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3188: checking for $ac_func" >&5
+echo "configure:3199: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3193 "configure"
+#line 3204 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3212,7 +3223,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3238,16 +3249,15 @@ fi
 done
 
 
-for ac_func in gethostbyname2 getpassphrase getpgrp issetugid memmove poll \
-		select
+for ac_func in gethostbyname2 getpassphrase getpgrp memmove poll select
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3246: checking for $ac_func" >&5
+echo "configure:3256: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3251 "configure"
+#line 3261 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3270,7 +3280,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3296,7 +3306,7 @@ done
 
 if test $ac_cv_func_getpgrp = yes; then
 	echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:3300: checking whether getpgrp takes no argument" >&5
+echo "configure:3310: checking whether getpgrp takes no argument" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3304,7 +3314,7 @@ else
   { echo "configure: error: cannot check getpgrp if cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3308 "configure"
+#line 3318 "configure"
 #include "confdefs.h"
 
 /*
@@ -3359,7 +3369,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:3363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -3383,17 +3393,78 @@ EOF
 fi
 
 fi
+if test $ac_cv_lib_util_fparseln != yes; then
+	for ac_func in fparseln
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:3401: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3406 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
+fi
+done
+
+
+fi
+
+LIBOBJS="$LIBOBJS glob.o"
 
 if test $ac_cv_func_strptime = yes; then
 	
 	echo $ac_n "checking for strptime() declaration""... $ac_c" 1>&6
-echo "configure:3391: checking for strptime() declaration" >&5
+echo "configure:3462: checking for strptime() declaration" >&5
 if eval "test \"`echo '$''{'ftp_cv_HAVE_STRPTIME_D'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3397 "configure"
+#line 3468 "configure"
 #include "confdefs.h"
  
 	#include <time.h>  
@@ -3401,7 +3472,7 @@ int main() {
   char *X = strptime("", "", NULL) ; 
 ; return 0; }
 EOF
-if { (eval echo configure:3405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_HAVE_STRPTIME_D=yes 
 else
@@ -3427,33 +3498,100 @@ EOF
 
 fi
 
-echo $ac_n "checking for GLOB_BRACE support in glob""... $ac_c" 1>&6
-echo "configure:3432: checking for GLOB_BRACE support in glob" >&5
-if test $ftp_cv_have_glob_brace = yes; then
-	cat >> confdefs.h <<\EOF
-#define HAVE_GLOB_BRACE 1
+if test $have_long_long = yes -a $ac_cv_sizeof_off_t -ge 8; then
+
+
+	echo $ac_n "checking *printf() support for %lld""... $ac_c" 1>&6
+echo "configure:3506: checking *printf() support for %lld" >&5
+	can_printf_longlong=no
+	if test "$cross_compiling" = yes; then
+   : 
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3512 "configure"
+#include "confdefs.h"
+
+		#include <stdio.h>
+		int main() {
+			char buf[100];
+			sprintf(buf, "%lld", 4294967300LL);
+			return (strcmp(buf, "4294967300"));
+		}
+	
 EOF
+if { (eval echo configure:3523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
+		echo "$ac_t""yes" 1>&6
+		can_printf_longlong=yes
+	
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
+		echo "$ac_t""no" 1>&6
+	
+fi
+rm -fr conftest*
+fi
 
-	echo "$ac_t""yes" 1>&6
+
+	if test $can_printf_longlong != yes; then
+		echo $ac_n "checking *printf() support for %qd""... $ac_c" 1>&6
+echo "configure:3543: checking *printf() support for %qd" >&5
+		if test "$cross_compiling" = yes; then
+   : 
 else
-	echo "$ac_t""no, using my own" 1>&6
-	LIBOBJS="$LIBOBJS glob.o"
+  cat > conftest.$ac_ext <<EOF
+#line 3548 "configure"
+#include "confdefs.h"
+
+			#include <stdio.h>
+			int main() {
+				char buf[100];
+				sprintf(buf, "%qd", 4294967300LL);
+				return (strcmp(buf, "4294967300"));
+			}
+		
+EOF
+if { (eval echo configure:3559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
+			echo "$ac_t""yes" 1>&6
+			can_printf_longlong=yes
+			cat >> confdefs.h <<\EOF
+#define HAVE_PRINTF_QD 1
+EOF
+
+		
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
+			echo "$ac_t""no" 1>&6
+		
+fi
+rm -fr conftest*
 fi
 
-if test $have_long_long = yes -a $ac_cv_sizeof_off_t -ge 8; then
-	cat >> confdefs.h <<\EOF
+	fi
+
+	if test $can_printf_longlong = yes; then
+		cat >> confdefs.h <<\EOF
 #define HAVE_QUAD_SUPPORT 1
 EOF
 
-	for ac_func in strtoll
+		for ac_func in strtoll
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3452: checking for $ac_func" >&5
+echo "configure:3590: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3457 "configure"
+#line 3595 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3476,7 +3614,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3502,52 +3640,8 @@ fi
 done
 
 
-	echo $ac_n "checking snprintf support for %lld""... $ac_c" 1>&6
-echo "configure:3507: checking snprintf support for %lld" >&5
-	if test $ac_cv_func_snprintf = yes; then
-		if test "$cross_compiling" = yes; then
-  
-			echo "$ac_t""cross-compiling" 1>&6
-			have_snprintf_lld=no
-		
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3516 "configure"
-#include "confdefs.h"
-
-			#include <stdio.h>
-			int main() {
-				char buf[100];
-				snprintf(buf, sizeof(buf), "%lld",
-				    4294967300LL);
-				return (strcmp(buf, "4294967300"));
-			}
-		
-EOF
-if { (eval echo configure:3528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  
-			echo "$ac_t""yes" 1>&6
-			have_snprintf_lld=yes
-		
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  
-			echo "$ac_t""no" 1>&6
-			have_snprintf_lld=no
-		
-fi
-rm -fr conftest*
-fi
-
-		if test $have_snprintf_lld = no; then
-			LIBOBJS="$LIBOBJS snprintf.o"
-		fi
-	else
-		echo "$ac_t""using local version" 1>&6
 	fi
+
 fi
 
 
@@ -3555,13 +3649,13 @@ if test $opt_editcomplete = yes; then
 	if test $have_libedit = yes; then
 		
 	echo $ac_n "checking for EL_RPROMPT in libedit""... $ac_c" 1>&6
-echo "configure:3559: checking for EL_RPROMPT in libedit" >&5
+echo "configure:3653: checking for EL_RPROMPT in libedit" >&5
 if eval "test \"`echo '$''{'ftp_cv_have_libedit'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3565 "configure"
+#line 3659 "configure"
 #include "confdefs.h"
  
 		#include <histedit.h>  
@@ -3569,7 +3663,7 @@ int main() {
   int X = EL_RPROMPT ; 
 ; return 0; }
 EOF
-if { (eval echo configure:3573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_have_libedit=yes 
 else
@@ -3593,9 +3687,9 @@ echo "$ac_t""$ftp_cv_have_libedit" 1>&6
 	fi
 
 	echo $ac_n "checking for working libedit""... $ac_c" 1>&6
-echo "configure:3597: checking for working libedit" >&5
+echo "configure:3691: checking for working libedit" >&5
 	if test $have_libedit = no; then
-		echo "$ac_t""no, using my own" 1>&6
+		echo "$ac_t""no - using my own" 1>&6
 		INCLUDES="-I\${srcdir}/../libedit $INCLUDES"
 		LDFLAGS="-L../libedit $LDFLAGS"
 		LIBS="-ledit $LIBS"
@@ -3611,13 +3705,13 @@ fi
 if test $ac_cv_func_sl_init = yes; then
 	
 	echo $ac_n "checking if sl_add() returns int""... $ac_c" 1>&6
-echo "configure:3615: checking if sl_add() returns int" >&5
+echo "configure:3709: checking if sl_add() returns int" >&5
 if eval "test \"`echo '$''{'ftp_cv_INT_SL_ADD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3621 "configure"
+#line 3715 "configure"
 #include "confdefs.h"
  
 	#include <stringlist.h>  
@@ -3625,7 +3719,7 @@ int main() {
   int f = sl_add((StringList *)0, "foo") ; 
 ; return 0; }
 EOF
-if { (eval echo configure:3629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_INT_SL_ADD=yes 
 else
@@ -3650,16 +3744,16 @@ fi
 
 
 have_rfc2553_netdb=no
-if test $ac_cv_func_getaddrinfo = yes; then
+if test $ac_cv_func_getaddrinfo = yes -a ! -n "$socks"; then
 	
 	echo $ac_n "checking for AI_NUMERICHOST""... $ac_c" 1>&6
-echo "configure:3657: checking for AI_NUMERICHOST" >&5
+echo "configure:3751: checking for AI_NUMERICHOST" >&5
 if eval "test \"`echo '$''{'ftp_cv_have_ai_numerichost'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3663 "configure"
+#line 3757 "configure"
 #include "confdefs.h"
  
 	#include <sys/types.h>
@@ -3669,7 +3763,7 @@ int main() {
   int X = AI_NUMERICHOST ; 
 ; return 0; }
 EOF
-if { (eval echo configure:3673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_have_ai_numerichost=yes 
 else
@@ -3691,14 +3785,20 @@ echo "$ac_t""$ftp_cv_have_ai_numerichost" 1>&6
 	fi
 
 fi
+echo $ac_n "checking for working getaddrinfo()""... $ac_c" 1>&6
+echo "configure:3790: checking for working getaddrinfo()" >&5
 if test $have_rfc2553_netdb = yes; then
 	cat >> confdefs.h <<\EOF
 #define HAVE_RFC2553_NETDB 1
 EOF
 
+	echo "$ac_t""yes" 1>&6
 else
 	if test $ac_cv_func_getaddrinfo = yes; then
 		LIBOBJS="$LIBOBJS getaddrinfo.o"
+		echo "$ac_t""no - using local version" 1>&6
+	else
+		echo "$ac_t""using local version" 1>&6
 	fi
 fi
 
@@ -3706,13 +3806,13 @@ fi
 if test $ac_cv_header_vis_h = yes; then
 	
 	echo $ac_n "checking for VIS_WHITE in vis.h""... $ac_c" 1>&6
-echo "configure:3710: checking for VIS_WHITE in vis.h" >&5
+echo "configure:3810: checking for VIS_WHITE in vis.h" >&5
 if eval "test \"`echo '$''{'ftp_cv_have_vis_white'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3716 "configure"
+#line 3816 "configure"
 #include "confdefs.h"
  
 	#include <sys/types.h>
@@ -3721,7 +3821,7 @@ int main() {
   int X = VIS_WHITE ; 
 ; return 0; }
 EOF
-if { (eval echo configure:3725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ftp_cv_have_vis_white=yes 
 else