[evolution-mapi] Bug #663867 - Cannot build against OpenChange svn trunk

[Milan Crha <mcrha src gnome org>]

commit c4c2ea2ac073bf41930a99b3453e977fe4ba4126
Author: Milan Crha <mcrha redhat com>
Date:   Wed Nov 23 12:26:19 2011 +0100

    Bug #663867 - Cannot build against OpenChange svn trunk

 configure.ac                           |   17 +++++++++++++++++
 src/libexchangemapi/e-mapi-cal-utils.c |    2 +-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b960aef..67fc987 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,6 +159,23 @@ LIBS=$save_libs
 AC_MSG_RESULT([$ac_cv_have_saw])
 
 dnl ****************************
+dnl Check for struct mapi_SLPSTRArrayW function
+dnl ****************************
+AC_MSG_CHECKING([libmapi struct mapi_SLPSTRArrayW])
+save_cflags=$CFLAGS; CFLAGS=$LIBMAPI_CFLAGS
+save_libs=$LIBS; LIBS="$LIBMAPI_LIBS"
+AC_LINK_IFELSE([AC_LANG_PROGRAM(
+	[[#include <libmapi/libmapi.h>]],
+	[[struct mapi_SLPSTRArrayW str;]])],
+	[ac_cv_have_msaw=yes],
+	[ac_cv_have_msaw=no
+	 save_cflags="$save_cflags -Dmapi_SLPSTRArrayW=mapi_SPLSTRArrayW"
+	])
+CFLAGS=$save_cflags
+LIBS=$save_libs
+AC_MSG_RESULT([$ac_cv_have_msaw])
+
+dnl ****************************
 dnl Expose version information
 dnl ****************************
 API_VERSION=$EDS_PACKAGE
diff --git a/src/libexchangemapi/e-mapi-cal-utils.c b/src/libexchangemapi/e-mapi-cal-utils.c
index c231075..bb9cf6d 100644
--- a/src/libexchangemapi/e-mapi-cal-utils.c
+++ b/src/libexchangemapi/e-mapi-cal-utils.c
@@ -2590,7 +2590,7 @@ e_mapi_cal_util_object_to_comp (EMapiConnection *conn,
 	ECalComponent *comp = NULL;
 	struct timeval t;
 	const gchar *str;
-	const struct mapi_SPLSTRArrayW *categories_array;
+	const struct mapi_SLPSTRArrayW *categories_array;
 	const struct SBinary_short *bin;
 	const uint32_t *ui32;
 	const bool *b;