[evolution-data-server/gnome-2-32] Don't dupplicate wspiapi.h internally This will put the responsibility to load a libary correctly to

[Fridrich Strba <strba src gnome org>]

commit 68493455b5690765a417136a762c1723575a43ea
Author: Fridrich Å trba <fridrich strba bluewin ch>
Date:   Mon Sep 13 23:49:55 2010 +0200

    Don't dupplicate wspiapi.h internally
    This will put the responsibility to load a libary correctly to the
    one who implements teh wspiapi.h header.

 camel/Makefile.am             |    3 +-
 camel/camel-mime-utils.c      |    4 +-
 camel/camel-net-utils-win32.h |  386 -----------------------------------------
 camel/camel-net-utils.c       |    4 +-
 camel/camel-sasl-digest-md5.c |    4 +-
 configure.ac                  |    3 +
 6 files changed, 13 insertions(+), 391 deletions(-)
---
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 6c7e4fb..97cf2d3 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -2,8 +2,7 @@ SUBDIRS = . providers tests
 
 if OS_WIN32
 LIBCAMEL_PLATFORM_DEP_SOURCES = \
-	camel-win32.c \
-	camel-net-utils-win32.h
+	camel-win32.c
 LIBCAMEL_PROVIDER_PLATFORM_DEP_SOURCES =
 LOCK_HELPER =
 else
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index 4b00513..6c76a2d 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -50,7 +50,9 @@
 #ifdef G_OS_WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include "camel-net-utils-win32.h"
+#ifdef HAVE_WSPIAPI_H
+#include <wspiapi.h>
+#endif
 #endif
 #include "camel-utf8.h"
 
diff --git a/camel/camel-net-utils.c b/camel/camel-net-utils.c
index d2b44f3..d0cc754 100644
--- a/camel/camel-net-utils.c
+++ b/camel/camel-net-utils.c
@@ -35,7 +35,9 @@
 #ifdef G_OS_WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include "camel-net-utils-win32.h"
+#ifdef HAVE_WSPIAPI_H
+#include <wspiapi.h>
+#endif
 #endif
 #include "camel-object.h"
 #include "camel-operation.h"
diff --git a/camel/camel-sasl-digest-md5.c b/camel/camel-sasl-digest-md5.c
index 1ca0dd4..ae12f7b 100644
--- a/camel/camel-sasl-digest-md5.c
+++ b/camel/camel-sasl-digest-md5.c
@@ -38,7 +38,9 @@
 #ifdef G_OS_WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include "camel-net-utils-win32.h"
+#ifdef HAVE_WSPIAPI_H
+#include <wspiapi.h>
+#endif
 #endif
 #include "camel-sasl-digest-md5.h"
 
diff --git a/configure.ac b/configure.ac
index a58865f..1e8e194 100644
--- a/configure.ac
+++ b/configure.ac
@@ -971,6 +971,9 @@ fi
 
 AM_CONDITIONAL(ENABLE_IPv6, [test "x$enable_ipv6" = "xyes"])
 
+AC_CHECK_HEADER([wspiapi.h],
+	[AC_DEFINE([HAVE_WSPIAPI_H], 1, [Have <wspiapi.h>])],,)
+
 dnl ******************************
 dnl Calendar support
 dnl ******************************