Don't leak csp->http->host_ip_addr_str when calling rfc2553_connect_to() multiple...

[privoxy.git] / configure.in

diff --git a/configure.in b/configure.in
index f265bbb..c86c8a5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl 
-dnl $Id: configure.in,v 1.143 2010/03/07 12:05:46 fabiankeil Exp $
+dnl $Id: configure.in,v 1.147 2010/10/30 15:57:50 fabiankeil Exp $
 dnl 
 dnl Written by and Copyright (C) 2001-2010 the
 dnl Privoxy team. http://www.privoxy.org/
@@ -32,7 +32,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
-AC_REVISION($Revision: 1.143 $)
+AC_REVISION($Revision: 1.147 $)
 AC_INIT(jcc.c)
 
 if test ! -f config.h.in; then
@@ -78,7 +78,7 @@ dnl =================================================================
 
 VERSION_MAJOR=3
 VERSION_MINOR=0
-VERSION_POINT=17
+VERSION_POINT=18
 CODE_STATUS="UNRELEASED"
 
 dnl CODE_STATUS can be "alpha", "beta", or "stable", and will be
@@ -298,6 +298,7 @@ fi])
 
 if test $target_type = mingw; then
   WIN_ONLY=
+  CFLAGS="$CFLAGS -DWINVER=0x501"
   SPECIAL_CFLAGS="-mwindows -mno-cygwin"
   PTHREAD_LIB=-lpthreadGC
   echo "Using mingw32 (Win32 GUI)"
@@ -713,13 +714,47 @@ dnl AC_FUNC_STAT
 AC_CHECK_FUNCS([access atexit getcwd gethostbyaddr gethostbyaddr_r gethostbyname gethostbyname_r gettimeofday inet_ntoa localtime_r memchr memmove memset poll putenv random regcomp select setlocale snprintf socket strchr strdup strerror strftime strlcat strlcpy strptime strstr strtoul timegm tzset])
 
 dnl Checks for RFC 2553 resolver and socket functions
-AC_CHECK_FUNC([getaddrinfo],
-   [AC_CHECK_FUNC([getnameinfo],
-      [AC_DEFINE([HAVE_RFC2553], [1],
-         [Define if RFC 2553 resolver functions like getaddrinfo(3) and
-          getnameinfo(3) present])
-      ])
-])
+if test $target_type = mingw; then
+  AC_CHECK_LIB(ws2_32, main)
+
+  AC_MSG_CHECKING(getaddrinfo in ws2_32)
+  AC_TRY_LINK(
+    [
+      #include<windows.h>
+      #include<ws2tcpip.h>
+    ],
+    [getaddrinfo(0,0,0,0)],
+    have_ws2_32_getaddrinfo=yes
+  )
+  AC_MSG_RESULT($have_ws2_32_getaddrinfo)
+
+  AC_MSG_CHECKING(getnameinfo in ws2_32)
+  AC_TRY_LINK(
+    [
+      #include<windows.h>
+      #include<ws2tcpip.h>
+    ],
+    [getnameinfo(0,0,0,0,0,0,0)],
+    have_ws2_32_getnameinfo=yes
+  )
+  AC_MSG_RESULT($have_ws2_32_getnameinfo)
+
+  if test $have_ws2_32_getaddrinfo ; then
+    if test $have_ws2_32_getnameinfo ; then
+      AC_DEFINE([HAVE_RFC2553], [1],
+        [Define if RFC 2553 resolver functions like getaddrinfo(3) and
+         getnameinfo(3) present])
+    fi
+  fi
+else
+  AC_CHECK_FUNC([getaddrinfo],
+     [AC_CHECK_FUNC([getnameinfo],
+        [AC_DEFINE([HAVE_RFC2553], [1],
+           [Define if RFC 2553 resolver functions like getaddrinfo(3) and
+            getnameinfo(3) present])
+        ])
+  ])
+fi
 
 dnl =================================================================
 dnl Checks for libraries.