diff options
Diffstat (limited to 'net/tnftp')
| -rw-r--r-- | net/tnftp/files/ChangeLog | 32 | ||||
| -rw-r--r-- | net/tnftp/files/acconfig.h | 30 | ||||
| -rw-r--r-- | net/tnftp/files/aclocal.m4 | 4 | ||||
| -rw-r--r-- | net/tnftp/files/config.h.in | 33 | ||||
| -rwxr-xr-x | net/tnftp/files/configure | 656 | ||||
| -rw-r--r-- | net/tnftp/files/configure.in | 36 | ||||
| -rw-r--r-- | net/tnftp/files/tnftp.h | 13 |
7 files changed, 324 insertions, 480 deletions
diff --git a/net/tnftp/files/ChangeLog b/net/tnftp/files/ChangeLog index 576b5e6e202..80243f5b87c 100644 --- a/net/tnftp/files/ChangeLog +++ b/net/tnftp/files/ChangeLog @@ -1,4 +1,34 @@ -NetBSD: ChangeLog,v 1.27 2005/06/10 04:40:13 lukem Exp +NetBSD: ChangeLog,v 1.30 2005/06/25 06:27:32 lukem Exp + +Sat Jun 25 06:27:00 UTC 2005 lukem + + * Release as "tnftp 20050625" + + * Simplify the detection & replacement of dirname() and fparseln() + and just use AC_REPLACE_FUNCS. + (We don't care if the vendor has a working version in -lgen or -lutil + instead of -lc; they'll get our replacement version in that case). + Fixes build issue on older Darwin where the previous autoconf check + wouldn't find dirname() in the default system libraries. + + * Only provide a prototype for dirname() if we can't find one in + <libgen.h> + + * Search for NS_IN6ADDRSZ instead of IN6ADDRSZ, since we use the + former and not the latter and older Darwin has the former. + (This allows INET6 support to be enabled on Darwin 7.9.0) + +Mon Jun 13 09:22:13 UTC 2005 lukem + + * Tweak SOCKS5 support: + acconfig.h: + - fix a comment + - ensure close() is replaced + - list entries in the same order as aclocal.m4 + (and the SOCKS5 FAQ) + aclocal.m4: + - ensure getpeername() is replaced + - don't replace listen() twice Fri Jun 10 04:39:33 UTC 2005 lukem diff --git a/net/tnftp/files/acconfig.h b/net/tnftp/files/acconfig.h index 5dfe37b2928..42fda506e93 100644 --- a/net/tnftp/files/acconfig.h +++ b/net/tnftp/files/acconfig.h @@ -1,4 +1,4 @@ -/* NetBSD: acconfig.h,v 1.6 2005/05/11 03:10:05 lukem Exp */ +/* NetBSD: acconfig.h,v 1.8 2005/06/25 06:14:08 lukem Exp */ @TOP@ @BOTTOM@ @@ -30,8 +30,8 @@ /* Define if `struct addrinfo' exists in <netdb.h> */ #undef HAVE_ADDRINFO -/* Define if IN6ADDRSZ exists in <arpa/nameser.h> */ -#undef HAVE_IN6ADDRSZ +/* Define if NS_IN6ADDRSZ exists in <arpa/nameser.h> */ +#undef HAVE_NS_IN6ADDRSZ /* * Define if <netdb.h> contains AI_NUMERICHOST et al. @@ -45,6 +45,9 @@ /* Define if h_errno exists in <netdb.h> */ #undef HAVE_H_ERRNO_D +/* Define if dirname() is declared in <libgen.h> */ +#undef HAVE_DIRNAME_D + /* Define if fclose() is declared in <stdio.h> */ #undef HAVE_FCLOSE_D @@ -75,27 +78,28 @@ /* * Define this if compiling with SOCKS (the firewall traversal library). * Also, you must define connect, getsockname, bind, accept, listen, and - * select to their R-versions. + * select to their SOCKS-versions. */ #undef SOCKS #undef SOCKS4 #undef SOCKS5 #undef connect #undef getsockname +#undef getpeername #undef bind #undef accept #undef listen #undef select +#undef recvfrom +#undef sendto +#undef recv +#undef send +#undef read +#undef write +#undef rresvport +#undef shutdown +#undef close #undef dup #undef dup2 #undef fclose #undef gethostbyname -#undef getpeername -#undef read -#undef recv -#undef recvfrom -#undef rresvport -#undef send -#undef sendto -#undef shutdown -#undef write diff --git a/net/tnftp/files/aclocal.m4 b/net/tnftp/files/aclocal.m4 index d5d12cdf16a..3a49654212f 100644 --- a/net/tnftp/files/aclocal.m4 +++ b/net/tnftp/files/aclocal.m4 @@ -1,4 +1,4 @@ -dnl NetBSD: aclocal.m4,v 1.3 2005/05/11 03:03:42 lukem Exp +dnl NetBSD: aclocal.m4,v 1.4 2005/06/13 09:20:21 lukem Exp dnl dnl @@ -223,6 +223,7 @@ AC_DEFUN(AC_LIBRARY_SOCKS, [ AC_DEFINE(SOCKS4) AC_DEFINE(connect, Rconnect) AC_DEFINE(getsockname, Rgetsockname) + AC_DEFINE(getpeername, Rgetpeername) AC_DEFINE(bind, Rbind) AC_DEFINE(accept, Raccept) AC_DEFINE(listen, Rlisten) @@ -247,7 +248,6 @@ AC_DEFUN(AC_LIBRARY_SOCKS, [ AC_DEFINE(write,SOCKSwrite) AC_DEFINE(rresvport,SOCKSrresvport) AC_DEFINE(shutdown,SOCKSshutdown) - AC_DEFINE(listen,SOCKSlisten) AC_DEFINE(close,SOCKSclose) AC_DEFINE(dup,SOCKSdup) AC_DEFINE(dup2,SOCKSdup2) diff --git a/net/tnftp/files/config.h.in b/net/tnftp/files/config.h.in index ca8f9600d90..2957899433d 100644 --- a/net/tnftp/files/config.h.in +++ b/net/tnftp/files/config.h.in @@ -1,5 +1,5 @@ /* config.h.in. Generated automatically from configure.in by autoheader. */ -/* NetBSD: config.h.in,v 1.10 2005/06/01 15:10:21 lukem Exp */ +/* NetBSD: config.h.in,v 1.12 2005/06/25 06:14:57 lukem Exp */ /* Define if on AIX 3. @@ -144,6 +144,9 @@ /* Define if you have the <err.h> header file. */ #undef HAVE_ERR_H +/* Define if you have the <libgen.h> header file. */ +#undef HAVE_LIBGEN_H + /* Define if you have the <libutil.h> header file. */ #undef HAVE_LIBUTIL_H @@ -213,8 +216,8 @@ /* Define if `struct addrinfo' exists in <netdb.h> */ #undef HAVE_ADDRINFO -/* Define if IN6ADDRSZ exists in <arpa/nameser.h> */ -#undef HAVE_IN6ADDRSZ +/* Define if NS_IN6ADDRSZ exists in <arpa/nameser.h> */ +#undef HAVE_NS_IN6ADDRSZ /* * Define if <netdb.h> contains AI_NUMERICHOST et al. @@ -228,6 +231,9 @@ /* Define if h_errno exists in <netdb.h> */ #undef HAVE_H_ERRNO_D +/* Define if dirname() is declared in <libgen.h> */ +#undef HAVE_DIRNAME_D + /* Define if fclose() is declared in <stdio.h> */ #undef HAVE_FCLOSE_D @@ -258,27 +264,28 @@ /* * Define this if compiling with SOCKS (the firewall traversal library). * Also, you must define connect, getsockname, bind, accept, listen, and - * select to their R-versions. + * select to their SOCKS-versions. */ #undef SOCKS #undef SOCKS4 #undef SOCKS5 #undef connect #undef getsockname +#undef getpeername #undef bind #undef accept #undef listen #undef select +#undef recvfrom +#undef sendto +#undef recv +#undef send +#undef read +#undef write +#undef rresvport +#undef shutdown +#undef close #undef dup #undef dup2 #undef fclose #undef gethostbyname -#undef getpeername -#undef read -#undef recv -#undef recvfrom -#undef rresvport -#undef send -#undef sendto -#undef shutdown -#undef write diff --git a/net/tnftp/files/configure b/net/tnftp/files/configure index e4d4c7492b4..85477e0a61b 100755 --- a/net/tnftp/files/configure +++ b/net/tnftp/files/configure @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.16 +# From configure.in Revision: 1.17 @@ -1121,79 +1121,17 @@ rm -f conftest* - -echo $ac_n "checking for library containing fparseln""... $ac_c" 1>&6 -echo "configure:1127: checking for library containing fparseln" >&5 -if eval "test \"`echo '$''{'ac_cv_search_fparseln'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_func_search_save_LIBS="$LIBS" -ac_cv_search_fparseln="no" -cat > conftest.$ac_ext <<EOF -#line 1134 "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 - builtin and then its argument prototype would still apply. */ -char fparseln(); - -int main() { -fparseln() -; return 0; } -EOF -if { (eval echo configure:1145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_fparseln="none required" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* -test "$ac_cv_search_fparseln" = "no" && for i in util; do -LIBS="-l$i $ac_func_search_save_LIBS" -cat > conftest.$ac_ext <<EOF -#line 1156 "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 - builtin and then its argument prototype would still apply. */ -char fparseln(); - -int main() { -fparseln() -; return 0; } -EOF -if { (eval echo configure:1167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_fparseln="-l$i" -break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* -done -LIBS="$ac_func_search_save_LIBS" -fi - -echo "$ac_t""$ac_cv_search_fparseln" 1>&6 -if test "$ac_cv_search_fparseln" != "no"; then - test "$ac_cv_search_fparseln" = "none required" || LIBS="$ac_cv_search_fparseln $LIBS" - have_fparseln=yes -else : - have_fparseln=no -fi if test $opt_editcomplete = yes; then echo $ac_n "checking for library containing tgetent""... $ac_c" 1>&6 -echo "configure:1190: checking for library containing tgetent" >&5 +echo "configure:1128: checking for library containing tgetent" >&5 if eval "test \"`echo '$''{'ac_cv_search_tgetent'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_tgetent="no" cat > conftest.$ac_ext <<EOF -#line 1197 "configure" +#line 1135 "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 @@ -1204,7 +1142,7 @@ int main() { tgetent() ; return 0; } EOF -if { (eval echo configure:1208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_tgetent="none required" else @@ -1215,7 +1153,7 @@ rm -f conftest* test "$ac_cv_search_tgetent" = "no" && for i in termcap termlib curses ncurses tinfo; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 1219 "configure" +#line 1157 "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 @@ -1226,7 +1164,7 @@ int main() { tgetent() ; return 0; } EOF -if { (eval echo configure:1230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_tgetent="-l$i" break @@ -1248,14 +1186,14 @@ else : fi echo $ac_n "checking for library containing el_init""... $ac_c" 1>&6 -echo "configure:1252: checking for library containing el_init" >&5 +echo "configure:1190: checking for library containing el_init" >&5 if eval "test \"`echo '$''{'ac_cv_search_el_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_el_init="no" cat > conftest.$ac_ext <<EOF -#line 1259 "configure" +#line 1197 "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 @@ -1266,7 +1204,7 @@ int main() { el_init() ; return 0; } EOF -if { (eval echo configure:1270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_el_init="none required" else @@ -1277,7 +1215,7 @@ rm -f conftest* test "$ac_cv_search_el_init" = "no" && for i in edit; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 1281 "configure" +#line 1219 "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 @@ -1288,7 +1226,7 @@ int main() { el_init() ; return 0; } EOF -if { (eval echo configure:1292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_el_init="-l$i" break @@ -1310,77 +1248,15 @@ else : fi fi -echo $ac_n "checking for library containing dirname""... $ac_c" 1>&6 -echo "configure:1315: checking for library containing dirname" >&5 -if eval "test \"`echo '$''{'ac_cv_search_dirname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_func_search_save_LIBS="$LIBS" -ac_cv_search_dirname="no" -cat > conftest.$ac_ext <<EOF -#line 1322 "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 - builtin and then its argument prototype would still apply. */ -char dirname(); - -int main() { -dirname() -; return 0; } -EOF -if { (eval echo configure:1333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_dirname="none required" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* -test "$ac_cv_search_dirname" = "no" && for i in gen; do -LIBS="-l$i $ac_func_search_save_LIBS" -cat > conftest.$ac_ext <<EOF -#line 1344 "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 - builtin and then its argument prototype would still apply. */ -char dirname(); - -int main() { -dirname() -; return 0; } -EOF -if { (eval echo configure:1355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_dirname="-l$i" -break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* -done -LIBS="$ac_func_search_save_LIBS" -fi - -echo "$ac_t""$ac_cv_search_dirname" 1>&6 -if test "$ac_cv_search_dirname" != "no"; then - test "$ac_cv_search_dirname" = "none required" || LIBS="$ac_cv_search_dirname $LIBS" - have_dirname=yes -else : - have_dirname=no -fi - # Most operating systems have gethostbyname() in the default searched # libraries (i.e. libc): echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1379: checking for gethostbyname" >&5 +echo "configure:1255: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1384 "configure" +#line 1260 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -1403,7 +1279,7 @@ gethostbyname(); ; return 0; } EOF -if { (eval echo configure:1407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -1422,7 +1298,7 @@ else echo "$ac_t""no" 1>&6 # Some OSes (eg. Solaris) place it in libnsl: echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1426: checking for gethostbyname in -lnsl" >&5 +echo "configure:1302: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1430,7 +1306,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 1434 "configure" +#line 1310 "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 @@ -1441,7 +1317,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:1445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1321: \"$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 @@ -1468,7 +1344,7 @@ else echo "$ac_t""no" 1>&6 # Some strange OSes (SINIX) have it in libsocket: echo $ac_n "checking for gethostbyname in -lsocket""... $ac_c" 1>&6 -echo "configure:1472: checking for gethostbyname in -lsocket" >&5 +echo "configure:1348: checking for gethostbyname in -lsocket" >&5 ac_lib_var=`echo socket'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1476,7 +1352,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 1480 "configure" +#line 1356 "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 @@ -1487,7 +1363,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:1491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1367: \"$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 @@ -1516,7 +1392,7 @@ else # AC_CHECK_LIB's API is essentially broken so the following # ugliness is necessary: echo $ac_n "checking for gethostbyname in -lsocket""... $ac_c" 1>&6 -echo "configure:1520: checking for gethostbyname in -lsocket" >&5 +echo "configure:1396: checking for gethostbyname in -lsocket" >&5 ac_lib_var=`echo socket'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1524,7 +1400,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket -lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 1528 "configure" +#line 1404 "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 @@ -1535,7 +1411,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:1539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1415: \"$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 @@ -1554,7 +1430,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6 -echo "configure:1558: checking for gethostbyname in -lresolv" >&5 +echo "configure:1434: checking for gethostbyname in -lresolv" >&5 ac_lib_var=`echo resolv'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1562,7 +1438,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 1566 "configure" +#line 1442 "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 @@ -1573,7 +1449,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:1577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1453: \"$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 @@ -1612,12 +1488,12 @@ fi fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:1616: checking for socket" >&5 +echo "configure:1492: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1621 "configure" +#line 1497 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ @@ -1640,7 +1516,7 @@ socket(); ; return 0; } EOF -if { (eval echo configure:1644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -1658,7 +1534,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:1662: checking for socket in -lsocket" >&5 +echo "configure:1538: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1666,7 +1542,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 1670 "configure" +#line 1546 "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 @@ -1677,7 +1553,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:1681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1557: \"$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 @@ -1703,7 +1579,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:1707: checking for socket in -lsocket" >&5 +echo "configure:1583: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1711,7 +1587,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket -lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 1715 "configure" +#line 1591 "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 @@ -1722,7 +1598,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:1726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1602: \"$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 @@ -1749,7 +1625,7 @@ fi echo $ac_n "checking whether to support SOCKS""... $ac_c" 1>&6 -echo "configure:1753: checking whether to support SOCKS" >&5 +echo "configure:1629: checking whether to support SOCKS" >&5 # Check whether --with-socks or --without-socks was given. if test "${with_socks+set}" = set; then withval="$with_socks" @@ -1761,7 +1637,7 @@ if test "${with_socks+set}" = set; then yes) echo "$ac_t""yes" 1>&6 echo $ac_n "checking for SOCKSconnect in -lsocks5""... $ac_c" 1>&6 -echo "configure:1765: checking for SOCKSconnect in -lsocks5" >&5 +echo "configure:1641: checking for SOCKSconnect in -lsocks5" >&5 ac_lib_var=`echo socks5'_'SOCKSconnect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1769,7 +1645,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocks5 $LIBS" cat > conftest.$ac_ext <<EOF -#line 1773 "configure" +#line 1649 "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 @@ -1780,7 +1656,7 @@ int main() { SOCKSconnect() ; return 0; } EOF -if { (eval echo configure:1784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1660: \"$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 @@ -1802,7 +1678,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for Rconnect in -lsocks""... $ac_c" 1>&6 -echo "configure:1806: checking for Rconnect in -lsocks" >&5 +echo "configure:1682: checking for Rconnect in -lsocks" >&5 ac_lib_var=`echo socks'_'Rconnect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1810,7 +1686,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocks $LIBS" cat > conftest.$ac_ext <<EOF -#line 1814 "configure" +#line 1690 "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 @@ -1821,7 +1697,7 @@ int main() { Rconnect() ; return 0; } EOF -if { (eval echo configure:1825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1701: \"$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 @@ -1858,7 +1734,7 @@ fi if test "x$socks" = "x"; then echo $ac_n "checking whether to support SOCKS5""... $ac_c" 1>&6 -echo "configure:1862: checking whether to support SOCKS5" >&5 +echo "configure:1738: checking whether to support SOCKS5" >&5 # Check whether --with-socks5 or --without-socks5 was given. if test "${with_socks5+set}" = set; then withval="$with_socks5" @@ -1893,14 +1769,14 @@ if test "${with_socks5+set}" = set; then TMPLIBS="$LIBS" LIBS="$LIBS $KERBEROS_LIBS" cat > conftest.$ac_ext <<EOF -#line 1897 "configure" +#line 1773 "configure" #include "confdefs.h" int main() { SOCKSconnect(); ; return 0; } EOF -if { (eval echo configure:1904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -1922,7 +1798,7 @@ fi if test "x$socks" = "x"; then echo $ac_n "checking whether to support SOCKS4""... $ac_c" 1>&6 -echo "configure:1926: checking whether to support SOCKS4" >&5 +echo "configure:1802: checking whether to support SOCKS4" >&5 # Check whether --with-socks4 or --without-socks4 was given. if test "${with_socks4+set}" = set; then withval="$with_socks4" @@ -1943,14 +1819,14 @@ if test "${with_socks4+set}" = set; then fi LIBS="$withval $LIBS" cat > conftest.$ac_ext <<EOF -#line 1947 "configure" +#line 1823 "configure" #include "confdefs.h" int main() { Rconnect(); ; return 0; } EOF -if { (eval echo configure:1954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -1987,6 +1863,10 @@ EOF EOF cat >> confdefs.h <<\EOF +#define getpeername Rgetpeername +EOF + + cat >> confdefs.h <<\EOF #define bind Rbind EOF @@ -2074,10 +1954,6 @@ EOF EOF cat >> confdefs.h <<\EOF -#define listen SOCKSlisten -EOF - - cat >> confdefs.h <<\EOF #define close SOCKSclose EOF @@ -2113,12 +1989,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:2117: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1993: 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 2122 "configure" +#line 1998 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -2126,7 +2002,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:2130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -2151,7 +2027,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:2155: checking for opendir in -ldir" >&5 +echo "configure:2031: 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 @@ -2159,7 +2035,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 2163 "configure" +#line 2039 "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 @@ -2170,7 +2046,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:2174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2050: \"$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 @@ -2192,7 +2068,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:2196: checking for opendir in -lx" >&5 +echo "configure:2072: 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 @@ -2200,7 +2076,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 2204 "configure" +#line 2080 "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 @@ -2211,7 +2087,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:2215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2091: \"$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 @@ -2234,12 +2110,12 @@ fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2238: checking for ANSI C header files" >&5 +echo "configure:2114: 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 2243 "configure" +#line 2119 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -2247,7 +2123,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2127: \"$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* @@ -2264,7 +2140,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 2268 "configure" +#line 2144 "configure" #include "confdefs.h" #include <string.h> EOF @@ -2282,7 +2158,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 2286 "configure" +#line 2162 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -2303,7 +2179,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 2307 "configure" +#line 2183 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2314,7 +2190,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2337,22 +2213,22 @@ EOF fi -for ac_hdr in arpa/nameser.h err.h regex.h paths.h poll.h sys/poll.h \ - sys/syslimits.h termcap.h util.h libutil.h vis.h +for ac_hdr in arpa/nameser.h err.h libgen.h regex.h paths.h poll.h \ + sys/poll.h sys/syslimits.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:2346: checking for $ac_hdr" >&5 +echo "configure:2222: 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 2351 "configure" +#line 2227 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2232: \"$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* @@ -2381,12 +2257,12 @@ done echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2385: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2261: 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 2390 "configure" +#line 2266 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -2395,7 +2271,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2416,12 +2292,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2420: checking for off_t" >&5 +echo "configure:2296: 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 2425 "configure" +#line 2301 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2449,7 +2325,7 @@ EOF fi echo $ac_n "checking size of off_t""... $ac_c" 1>&6 -echo "configure:2453: checking size of off_t" >&5 +echo "configure:2329: 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 @@ -2457,7 +2333,7 @@ else ac_cv_sizeof_off_t=0 else cat > conftest.$ac_ext <<EOF -#line 2461 "configure" +#line 2337 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2468,7 +2344,7 @@ main() exit(0); } EOF -if { (eval echo configure:2472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2348: \"$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 @@ -2489,13 +2365,13 @@ EOF echo $ac_n "checking for long long""... $ac_c" 1>&6 -echo "configure:2493: checking for long long" >&5 +echo "configure:2369: 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 2499 "configure" +#line 2375 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2507,7 +2383,7 @@ int main() { ; ; return 0; } EOF -if { (eval echo configure:2511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2387: \"$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 @@ -2537,13 +2413,13 @@ EOF echo $ac_n "checking for in_port_t""... $ac_c" 1>&6 -echo "configure:2541: checking for in_port_t" >&5 +echo "configure:2417: 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 2547 "configure" +#line 2423 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2553,7 +2429,7 @@ int main() { in_port_t X ; ; return 0; } EOF -if { (eval echo configure:2557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_IN_PORT_T=yes else @@ -2580,13 +2456,13 @@ EOF echo $ac_n "checking for sa_family_t""... $ac_c" 1>&6 -echo "configure:2584: checking for sa_family_t" >&5 +echo "configure:2460: 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 2590 "configure" +#line 2466 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2596,7 +2472,7 @@ int main() { sa_family_t X ; ; return 0; } EOF -if { (eval echo configure:2600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_SA_FAMILY_T=yes else @@ -2623,13 +2499,13 @@ EOF echo $ac_n "checking for sockaddr_in.sin_len""... $ac_c" 1>&6 -echo "configure:2627: checking for sockaddr_in.sin_len" >&5 +echo "configure:2503: 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 2633 "configure" +#line 2509 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2643,7 +2519,7 @@ int main() { ; ; return 0; } EOF -if { (eval echo configure:2647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_SOCKADDR_SA_LEN=yes else @@ -2670,13 +2546,13 @@ EOF echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:2674: checking for socklen_t" >&5 +echo "configure:2550: 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 2680 "configure" +#line 2556 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2686,7 +2562,7 @@ int main() { socklen_t X ; ; return 0; } EOF -if { (eval echo configure:2690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_SOCKLEN_T=yes else @@ -2715,13 +2591,13 @@ if test $opt_ipv6 = yes; then echo $ac_n "checking for AF_INET6""... $ac_c" 1>&6 -echo "configure:2719: checking for AF_INET6" >&5 +echo "configure:2595: 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 2725 "configure" +#line 2601 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2731,7 +2607,7 @@ int main() { int X = AF_INET6 ; ; return 0; } EOF -if { (eval echo configure:2735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_AF_INET6=yes else @@ -2758,13 +2634,13 @@ EOF echo $ac_n "checking for struct sockaddr_in6""... $ac_c" 1>&6 -echo "configure:2762: checking for struct sockaddr_in6" >&5 +echo "configure:2638: 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 2768 "configure" +#line 2644 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2777,7 +2653,7 @@ int main() { ; ; return 0; } EOF -if { (eval echo configure:2781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_SOCKADDR_IN6=yes else @@ -2804,42 +2680,42 @@ EOF if test $ac_cv_header_arpa_nameser_h = yes; then - echo $ac_n "checking for IN6ADDRSZ in arpa/nameser.h""... $ac_c" 1>&6 -echo "configure:2809: checking for IN6ADDRSZ in arpa/nameser.h" >&5 -if eval "test \"`echo '$''{'ftp_cv_HAVE_IN6ADDRSZ'+set}'`\" = set"; then + echo $ac_n "checking for NS_IN6ADDRSZ in arpa/nameser.h""... $ac_c" 1>&6 +echo "configure:2685: checking for NS_IN6ADDRSZ in arpa/nameser.h" >&5 +if eval "test \"`echo '$''{'ftp_cv_HAVE_NS_IN6ADDRSZ'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2815 "configure" +#line 2691 "configure" #include "confdefs.h" #include <sys/types.h> #include <arpa/nameser.h> int main() { - int X = IN6ADDRSZ ; + int X = NS_IN6ADDRSZ ; ; return 0; } EOF -if { (eval echo configure:2825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ftp_cv_HAVE_IN6ADDRSZ=yes + ftp_cv_HAVE_NS_IN6ADDRSZ=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ftp_cv_HAVE_IN6ADDRSZ=no + ftp_cv_HAVE_NS_IN6ADDRSZ=no fi rm -f conftest* fi -echo "$ac_t""$ftp_cv_HAVE_IN6ADDRSZ" 1>&6 - if test "x$ftp_cv_HAVE_IN6ADDRSZ" = "xyes"; then - cat >> confdefs.h <<\EOF -#define HAVE_IN6ADDRSZ 1 +echo "$ac_t""$ftp_cv_HAVE_NS_IN6ADDRSZ" 1>&6 + if test "x$ftp_cv_HAVE_NS_IN6ADDRSZ" = "xyes"; then + cat >> confdefs.h <<\EOF +#define HAVE_NS_IN6ADDRSZ 1 EOF - + else : @@ -2851,13 +2727,13 @@ fi echo $ac_n "checking for struct addrinfo""... $ac_c" 1>&6 -echo "configure:2855: checking for struct addrinfo" >&5 +echo "configure:2731: 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 2861 "configure" +#line 2737 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2868,7 +2744,7 @@ int main() { struct addrinfo X ; ; return 0; } EOF -if { (eval echo configure:2872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_ADDRINFO=yes else @@ -2895,13 +2771,13 @@ EOF echo $ac_n "checking for d_namlen in struct dirent""... $ac_c" 1>&6 -echo "configure:2899: checking for d_namlen in struct dirent" >&5 +echo "configure:2775: 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 2905 "configure" +#line 2781 "configure" #include "confdefs.h" #if HAVE_DIRENT_H @@ -2926,7 +2802,7 @@ int main() { ; ; return 0; } EOF -if { (eval echo configure:2930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_D_NAMLEN=yes else @@ -2953,13 +2829,13 @@ EOF echo $ac_n "checking for h_errno declaration""... $ac_c" 1>&6 -echo "configure:2957: checking for h_errno declaration" >&5 +echo "configure:2833: 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 2963 "configure" +#line 2839 "configure" #include "confdefs.h" #include <netdb.h> @@ -2968,7 +2844,7 @@ int main() { int X = h_errno ; ; return 0; } EOF -if { (eval echo configure:2972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_H_ERRNO_D=yes else @@ -2994,14 +2870,56 @@ EOF + echo $ac_n "checking for dirname() declaration""... $ac_c" 1>&6 +echo "configure:2875: checking for dirname() declaration" >&5 +if eval "test \"`echo '$''{'ftp_cv_HAVE_DIRNAME_D'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext <<EOF +#line 2881 "configure" +#include "confdefs.h" + +#include <libgen.h> + +int main() { + char *(*X)() = dirname ; +; return 0; } +EOF +if { (eval echo configure:2890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ftp_cv_HAVE_DIRNAME_D=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ftp_cv_HAVE_DIRNAME_D=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ftp_cv_HAVE_DIRNAME_D" 1>&6 + if test "x$ftp_cv_HAVE_DIRNAME_D" = "xyes"; then + cat >> confdefs.h <<\EOF +#define HAVE_DIRNAME_D 1 +EOF + + else + + : + fi + + + echo $ac_n "checking for fclose() declaration""... $ac_c" 1>&6 -echo "configure:2999: checking for fclose() declaration" >&5 +echo "configure:2917: 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 3005 "configure" +#line 2923 "configure" #include "confdefs.h" #include <stdio.h> @@ -3010,7 +2928,7 @@ int main() { int (*X)() = fclose ; ; return 0; } EOF -if { (eval echo configure:3014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_FCLOSE_D=yes else @@ -3037,13 +2955,13 @@ EOF echo $ac_n "checking for getpass() declaration""... $ac_c" 1>&6 -echo "configure:3041: checking for getpass() declaration" >&5 +echo "configure:2959: 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 3047 "configure" +#line 2965 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3053,7 +2971,7 @@ int main() { char *(*X)() = getpass ; ; return 0; } EOF -if { (eval echo configure:3057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_GETPASS_D=yes else @@ -3080,13 +2998,13 @@ EOF echo $ac_n "checking for optarg declaration""... $ac_c" 1>&6 -echo "configure:3084: checking for optarg declaration" >&5 +echo "configure:3002: 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 3090 "configure" +#line 3008 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3096,7 +3014,7 @@ int main() { char *X = optarg ; ; return 0; } EOF -if { (eval echo configure:3100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_OPTARG_D=yes else @@ -3123,13 +3041,13 @@ EOF echo $ac_n "checking for optind declaration""... $ac_c" 1>&6 -echo "configure:3127: checking for optind declaration" >&5 +echo "configure:3045: 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 3133 "configure" +#line 3051 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3139,7 +3057,7 @@ int main() { int X = optind ; ; return 0; } EOF -if { (eval echo configure:3143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_OPTIND_D=yes else @@ -3166,13 +3084,13 @@ EOF echo $ac_n "checking for pclose() declaration""... $ac_c" 1>&6 -echo "configure:3170: checking for pclose() declaration" >&5 +echo "configure:3088: 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 3176 "configure" +#line 3094 "configure" #include "confdefs.h" #include <stdio.h> @@ -3181,7 +3099,7 @@ int main() { int (*X)() = pclose ; ; return 0; } EOF -if { (eval echo configure:3185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_PCLOSE_D=yes else @@ -3207,18 +3125,18 @@ EOF -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 \ +for ac_func in dirname err fgetln fparseln fseeko getaddrinfo getnameinfo \ + inet_ntop inet_pton mkstemp setprogname sl_init snprintf \ + strdup strerror strlcat strlcpy strptime strsep strunvis \ strvis timegm usleep utimes do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3217: checking for $ac_func" >&5 +echo "configure:3135: 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 3222 "configure" +#line 3140 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3241,7 +3159,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3163: \"$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 @@ -3270,12 +3188,12 @@ done for ac_func in gethostbyname2 getpassphrase getpgrp memmove select do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3274: checking for $ac_func" >&5 +echo "configure:3192: 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 3279 "configure" +#line 3197 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3298,7 +3216,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3220: \"$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 @@ -3322,127 +3240,9 @@ else fi done -if test $have_fparseln != yes; then - for ac_func in fparseln -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3330: 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 3335 "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:3358: \"$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 -if test $have_dirname != yes; then - for ac_func in dirname -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3389: 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 3394 "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:3417: \"$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 if test $ac_cv_func_getpgrp = yes; then echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:3446: checking whether getpgrp takes no argument" >&5 +echo "configure:3246: 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 @@ -3450,7 +3250,7 @@ else { echo "configure: error: cannot check getpgrp if cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 3454 "configure" +#line 3254 "configure" #include "confdefs.h" /* @@ -3505,7 +3305,7 @@ main() } EOF -if { (eval echo configure:3509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3309: \"$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 @@ -3535,13 +3335,13 @@ 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:3539: checking for strptime() declaration" >&5 +echo "configure:3339: 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 3545 "configure" +#line 3345 "configure" #include "confdefs.h" #include <time.h> @@ -3552,7 +3352,7 @@ int main() { ; ; return 0; } EOF -if { (eval echo configure:3556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_STRPTIME_D=yes else @@ -3582,13 +3382,13 @@ 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:3586: checking *printf() support for %lld" >&5 +echo "configure:3386: checking *printf() support for %lld" >&5 can_printf_longlong=no if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 3592 "configure" +#line 3392 "configure" #include "confdefs.h" #include <stdio.h> @@ -3599,7 +3399,7 @@ int main() { } EOF -if { (eval echo configure:3603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3403: \"$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 @@ -3619,12 +3419,12 @@ fi if test $can_printf_longlong != yes; then echo $ac_n "checking *printf() support for %qd""... $ac_c" 1>&6 -echo "configure:3623: checking *printf() support for %qd" >&5 +echo "configure:3423: checking *printf() support for %qd" >&5 if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 3628 "configure" +#line 3428 "configure" #include "confdefs.h" #include <stdio.h> @@ -3635,7 +3435,7 @@ int main() { } EOF -if { (eval echo configure:3639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3439: \"$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 @@ -3666,12 +3466,12 @@ EOF for ac_func in strtoll do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3670: checking for $ac_func" >&5 +echo "configure:3470: 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 3675 "configure" +#line 3475 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3694,7 +3494,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3498: \"$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 @@ -3726,12 +3526,12 @@ fi if test $ac_cv_header_poll_h = yes || test $ac_cv_header_sys_poll_h = yes; then echo $ac_n "checking for poll""... $ac_c" 1>&6 -echo "configure:3730: checking for poll" >&5 +echo "configure:3530: checking for poll" >&5 if eval "test \"`echo '$''{'ac_cv_func_poll'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3735 "configure" +#line 3535 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char poll(); below. */ @@ -3754,7 +3554,7 @@ poll(); ; return 0; } EOF -if { (eval echo configure:3758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_poll=yes" else @@ -3771,13 +3571,13 @@ if eval "test \"`echo '$ac_cv_func_'poll`\" = yes"; then echo $ac_n "checking if poll() is implemented natively""... $ac_c" 1>&6 -echo "configure:3775: checking if poll() is implemented natively" >&5 +echo "configure:3575: checking if poll() is implemented natively" >&5 if eval "test \"`echo '$''{'ftp_cv_POLL_NATIVE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3781 "configure" +#line 3581 "configure" #include "confdefs.h" #if HAVE_POLL_H @@ -3795,7 +3595,7 @@ int main() { ; ; return 0; } EOF -if { (eval echo configure:3799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_POLL_NATIVE=yes else @@ -3827,13 +3627,13 @@ fi echo $ac_n "checking for struct pollfd""... $ac_c" 1>&6 -echo "configure:3831: checking for struct pollfd" >&5 +echo "configure:3631: checking for struct pollfd" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_STRUCT_POLLFD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3837 "configure" +#line 3637 "configure" #include "confdefs.h" #if HAVE_POLL_H @@ -3847,7 +3647,7 @@ int main() { struct pollfd X ; ; return 0; } EOF -if { (eval echo configure:3851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_STRUCT_POLLFD=yes else @@ -3878,13 +3678,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:3882: checking for EL_RPROMPT in libedit" >&5 +echo "configure:3682: 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 3888 "configure" +#line 3688 "configure" #include "confdefs.h" #include <histedit.h> @@ -3893,7 +3693,7 @@ int main() { int X = EL_RPROMPT ; ; return 0; } EOF -if { (eval echo configure:3897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_have_libedit=yes else @@ -3919,7 +3719,7 @@ echo "$ac_t""$ftp_cv_have_libedit" 1>&6 have_libedit=no echo $ac_n "checking for up-to-date libedit""... $ac_c" 1>&6 -echo "configure:3923: checking for up-to-date libedit" >&5 +echo "configure:3723: checking for up-to-date libedit" >&5 if test $have_libedit = no; then echo "$ac_t""no - using my own" 1>&6 INCLUDES="-I\${srcdir}/../libedit $INCLUDES" @@ -3937,13 +3737,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:3941: checking if sl_add() returns int" >&5 +echo "configure:3741: 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 3947 "configure" +#line 3747 "configure" #include "confdefs.h" #include <stringlist.h> @@ -3954,7 +3754,7 @@ int main() { ; ; return 0; } EOF -if { (eval echo configure:3958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_INT_SL_ADD=yes else @@ -3982,13 +3782,13 @@ have_rfc2553_netdb=no if test $ac_cv_func_getaddrinfo = yes -a ! -n "$socks"; then echo $ac_n "checking for AI_NUMERICHOST""... $ac_c" 1>&6 -echo "configure:3986: checking for AI_NUMERICHOST" >&5 +echo "configure:3786: 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 3992 "configure" +#line 3792 "configure" #include "confdefs.h" #include <sys/types.h> @@ -3999,7 +3799,7 @@ int main() { int X = AI_NUMERICHOST ; ; return 0; } EOF -if { (eval echo configure:4003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_have_ai_numerichost=yes else @@ -4022,7 +3822,7 @@ echo "$ac_t""$ftp_cv_have_ai_numerichost" 1>&6 fi echo $ac_n "checking for working getaddrinfo()""... $ac_c" 1>&6 -echo "configure:4026: checking for working getaddrinfo()" >&5 +echo "configure:3826: checking for working getaddrinfo()" >&5 if test $have_rfc2553_netdb = yes; then cat >> confdefs.h <<\EOF #define HAVE_RFC2553_NETDB 1 @@ -4042,13 +3842,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:4046: checking for VIS_WHITE in vis.h" >&5 +echo "configure:3846: 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 4052 "configure" +#line 3852 "configure" #include "confdefs.h" #include <sys/types.h> @@ -4058,7 +3858,7 @@ int main() { int X = VIS_WHITE ; ; return 0; } EOF -if { (eval echo configure:4062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_have_vis_white=yes else diff --git a/net/tnftp/files/configure.in b/net/tnftp/files/configure.in index 8d979674d2c..9028e0488cd 100644 --- a/net/tnftp/files/configure.in +++ b/net/tnftp/files/configure.in @@ -1,10 +1,10 @@ -dnl NetBSD: configure.in,v 1.16 2005/06/02 00:20:32 lukem Exp +dnl NetBSD: configure.in,v 1.17 2005/06/25 06:14:08 lukem Exp dnl dnl configure.in -- dnl process this file with autoconf to produce a configure script. dnl -AC_REVISION([Revision: 1.16])dnl +AC_REVISION([Revision: 1.17])dnl AC_INIT(tnftp.h) @@ -37,13 +37,11 @@ AC_AIX dnl Checks for libraries. dnl -AC_SEARCH_LIBS(fparseln, [util], [have_fparseln=yes], [have_fparseln=no]) if test $opt_editcomplete = yes; then AC_SEARCH_LIBS(tgetent, [termcap termlib curses ncurses tinfo], , AC_MSG_ERROR([no relevant library found containing tgetent])) AC_SEARCH_LIBS(el_init, [edit], [have_libedit=yes], [have_libedit=no]) fi -AC_SEARCH_LIBS(dirname, [gen], [have_dirname=yes], [have_dirname=no]) AC_LIBRARY_NET AC_LIBRARY_SOCKS if test -n "$socks"; then @@ -59,8 +57,8 @@ dnl AC_CONFIG_HEADER(config.h) AC_HEADER_DIRENT AC_HEADER_STDC -AC_CHECK_HEADERS([arpa/nameser.h err.h regex.h paths.h poll.h sys/poll.h \ - sys/syslimits.h termcap.h util.h libutil.h vis.h]) +AC_CHECK_HEADERS([arpa/nameser.h err.h libgen.h regex.h paths.h poll.h \ + sys/poll.h sys/syslimits.h termcap.h util.h libutil.h vis.h]) dnl Checks for typedefs, structures, and compiler characteristics. @@ -119,11 +117,13 @@ if test $opt_ipv6 = yes; then ], [AC_DEFINE(HAVE_SOCKADDR_IN6, 1)]) if test $ac_cv_header_arpa_nameser_h = yes; then - AC_MSG_TRY_COMPILE([for IN6ADDRSZ in arpa/nameser.h], - ftp_cv_HAVE_IN6ADDRSZ, [ + AC_MSG_TRY_COMPILE([for NS_IN6ADDRSZ in arpa/nameser.h], + ftp_cv_HAVE_NS_IN6ADDRSZ, [ #include <sys/types.h> #include <arpa/nameser.h> - ], [ int X = IN6ADDRSZ ], [AC_DEFINE(HAVE_IN6ADDRSZ, 1)]) + ], + [ int X = NS_IN6ADDRSZ ], + [ AC_DEFINE(HAVE_NS_IN6ADDRSZ, 1) ]) fi fi @@ -158,6 +158,10 @@ AC_MSG_TRY_COMPILE([for h_errno declaration], ftp_cv_HAVE_H_ERRNO_D, [ #include <netdb.h> ], [ int X = h_errno ], [AC_DEFINE(HAVE_H_ERRNO_D, 1)]) +AC_MSG_TRY_COMPILE([for dirname() declaration], ftp_cv_HAVE_DIRNAME_D, [ +#include <libgen.h> + ], [ char *(*X)() = dirname ], [ AC_DEFINE(HAVE_DIRNAME_D, 1)]) + AC_MSG_TRY_COMPILE([for fclose() declaration], ftp_cv_HAVE_FCLOSE_D, [ #include <stdio.h> ], [ int (*X)() = fclose ], [AC_DEFINE(HAVE_FCLOSE_D, 1)]) @@ -184,21 +188,17 @@ AC_MSG_TRY_COMPILE([for pclose() declaration], ftp_cv_HAVE_PCLOSE_D, [ dnl Checks for library functions. dnl -AC_REPLACE_FUNCS([err fgetln fseeko getaddrinfo getnameinfo inet_ntop \ - inet_pton mkstemp setprogname sl_init snprintf strdup \ - strerror strlcat strlcpy strptime strsep strunvis \ +AC_REPLACE_FUNCS([dirname err fgetln fparseln fseeko getaddrinfo getnameinfo \ + inet_ntop inet_pton mkstemp setprogname sl_init snprintf \ + strdup strerror strlcat strlcpy strptime strsep strunvis \ strvis timegm usleep utimes]) AC_CHECK_FUNCS([gethostbyname2 getpassphrase getpgrp memmove select]) -if test $have_fparseln != yes; then - AC_REPLACE_FUNCS(fparseln) -fi -if test $have_dirname != yes; then - AC_REPLACE_FUNCS(dirname) -fi if test $ac_cv_func_getpgrp = yes; then AC_FUNC_GETPGRP fi +dnl Always replace glob(3); the vendor's may not be secure. +dnl LIBOBJS="$LIBOBJS glob.o" if test $ac_cv_func_strptime = yes; then diff --git a/net/tnftp/files/tnftp.h b/net/tnftp/files/tnftp.h index e0afb921f95..22df1cfd48d 100644 --- a/net/tnftp/files/tnftp.h +++ b/net/tnftp/files/tnftp.h @@ -1,7 +1,7 @@ -/* NetBSD: tnftp.h,v 1.19 2005/06/10 04:40:13 lukem Exp */ +/* NetBSD: tnftp.h,v 1.21 2005/06/25 06:27:32 lukem Exp */ #define FTP_PRODUCT "tnftp" -#define FTP_VERSION "20050610" +#define FTP_VERSION "20050625" #include "config.h" @@ -22,7 +22,6 @@ #include <ctype.h> #include <errno.h> #include <fcntl.h> -#include <libgen.h> #include <limits.h> #ifdef HAVE_RFC2553_NETDB #include <netdb.h> @@ -121,6 +120,10 @@ struct pollfd { # include "ftpglob.h" #endif +#if HAVE_LIBGEN_H +# include <libgen.h> +#endif + #if HAVE_PATHS_H # include <paths.h> #endif @@ -179,7 +182,7 @@ typedef unsigned short sa_family_t; typedef unsigned int socklen_t; #endif -#if HAVE_AF_INET6 && HAVE_SOCKADDR_IN6 && HAVE_IN6ADDRSZ +#if HAVE_AF_INET6 && HAVE_SOCKADDR_IN6 && HAVE_NS_IN6ADDRSZ # define INET6 #endif @@ -312,7 +315,7 @@ extern int optind; int pclose(FILE *); #endif -#if ! HAVE_DIRNAME +#if ! HAVE_DIRNAME_D char *dirname(char *); #endif |