diff options
| author | nijtmans <nijtmans> | 2010-09-29 19:30:30 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-09-29 19:30:30 (GMT) |
| commit | 8015d8ecc44e86dd724727015616d87ac53220f8 (patch) | |
| tree | f3f1c8e14543367b42aa17eafc30a62761ce05c4 | |
| parent | 9890fd478c478c32b807fbfb8623b32dab09f78a (diff) | |
| download | tk-8015d8ecc44e86dd724727015616d87ac53220f8.zip tk-8015d8ecc44e86dd724727015616d87ac53220f8.tar.gz tk-8015d8ecc44e86dd724727015616d87ac53220f8.tar.bz2 | |
re-generate configure with autoconf-2.59
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | unix/tcl.m4 | 50 | ||||
| -rwxr-xr-x | win/configure | 2 |
3 files changed, 26 insertions, 32 deletions
@@ -1,3 +1,9 @@ +2010-09-29 Jan Nijtmans <nijtmans@users.sf.net> + + * unix/tcl.m4: sync with tcl version + * unix/configure: re-generate with autoconf-2.59 + * win/configure: + 2010-09-28 Jan Nijtmans <nijtmans@users.sf.net> * win/tkWinSend.c: [Bug 3076671] CVS HEAD Tk build fails on win32 diff --git a/unix/tcl.m4 b/unix/tcl.m4 index c86e994..6d21d69 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -3013,37 +3013,6 @@ AC_DEFUN([SC_TCL_GETHOSTBYNAME_R], [AC_CHECK_FUNC(gethostbyname_r, [ ])]) #-------------------------------------------------------------------- -# SC_TCL_GETADDRINFO -# -# Check if we have 'getaddrinfo' -# -# Arguments: -# None -# -# Results: -# Might define the following vars: -# HAVE_GETADDRINFO -# -#-------------------------------------------------------------------- - -AC_DEFUN([SC_TCL_GETADDRINFO], [AC_CHECK_FUNC(getaddrinfo, [ - AC_CACHE_CHECK([for working getaddrinfo], tcl_cv_api_getaddrinfo, [ - AC_TRY_COMPILE([ - #include <netdb.h> - ], [ - const char *name, *port; - struct addrinfo *aiPtr, hints; - (void)getaddrinfo(name,port, &hints, &aiPtr); - (void)freeaddrinfo(aiPtr); - ], tcl_cv_api_getaddrinfo=yes, tcl_cv_getaddrinfo=no)]) - tcl_ok=$tcl_cv_api_getaddrinfo - if test "$tcl_ok" = yes; then - AC_DEFINE(HAVE_GETADDRINFO, 1, - [Define to 1 if getaddrinfo is available.]) - fi -])]) - -#-------------------------------------------------------------------- # SC_TCL_GETPWUID_R # # Check if we have MT-safe variant of getpwuid() and if yes, @@ -3283,6 +3252,25 @@ AC_DEFUN([SC_TCL_GETGRNAM_R], [AC_CHECK_FUNC(getgrnam_r, [ fi ])]) +AC_DEFUN([SC_TCL_IPV6],[ + NEED_FAKE_RFC2553=0 + AC_CHECK_FUNCS(getnameinfo getaddrinfo freeaddrinfo gai_strerror,,[NEED_FAKE_RFC2553=1]) + AC_CHECK_TYPES([ + struct addrinfo, + struct in6_addr, + struct sockaddr_in6, + struct sockaddr_storage],,[NEED_FAKE_RFC2553=1],[[ +#include <sys/types.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <netdb.h> +]]) +if test "x$NEED_FAKE_RFC2553" = "x1"; then + AC_DEFINE(NEED_FAKE_RFC2553) + AC_LIBOBJ([fake-rfc2553]) + AC_CHECK_FUNC(strlcpy) +fi +]) # Local Variables: # mode: autoconf # End: diff --git a/win/configure b/win/configure index af10732..dbef146 100755 --- a/win/configure +++ b/win/configure @@ -3449,7 +3449,7 @@ echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6 fi fi - LIBS="user32.lib advapi32.lib ws2_32.lib" + LIBS="kernel32.lib user32.lib advapi32.lib ws2_32.lib" if test "$do64bit" != "no" ; then # The space-based-path will work for the Makefile, but will # not work if AC_TRY_COMPILE is called. TEA has the |