[Libreoffice-commits] .: libcmis/ExternalLib_libcmis.mk libcmis/libcmis-0.1.0-autotools.patch

[Jan Holesovsky]

 libcmis/ExternalLib_libcmis.mk        |    9 +++++++++
 libcmis/libcmis-0.1.0-autotools.patch |   23 +++++++++++++++++++++++
 2 files changed, 32 insertions(+)

New commits:
commit 63135c903cf3e9dfca28bb47358e272c5c30cad4
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Oct 5 12:06:35 2011 +0200

    Make libcmis build with MinGW.

diff --git a/libcmis/ExternalLib_libcmis.mk b/libcmis/ExternalLib_libcmis.mk
index 797dea5..77c5bde 100644
--- a/libcmis/ExternalLib_libcmis.mk
+++ b/libcmis/ExternalLib_libcmis.mk
@@ -34,6 +34,15 @@ $(eval $(call gb_ExternalLib_add_patch,libcmis,libcmis/libcmis-0.1.0-autotools.p
 $(eval $(call gb_ExternalLib_add_conf_arg,libcmis,--disable-tests))
 $(eval $(call gb_ExternalLib_add_conf_arg,libcmis,--disable-static))
 
+ifeq ($(GUI)$(COM),WNTGCC)
+ifeq ($(SYSTEM_CURL),YES)
+$(eval $(call gb_ExternalLib_add_conf_arg,libcmis,--with-libcurl=/usr/i686-w64-mingw32/sys-root/mingw))
+endif
+ifeq ($(SYSTEM_LIBXML),YES)
+$(eval $(call gb_ExternalLib_add_conf_arg,libcmis,--with-libxml2=/usr/i686-w64-mingw32/sys-root/mingw))
+endif
+endif
+
 ifneq ($(filter $(OS),MACOSX ANDROID),)
 
 $(eval $(call gb_ExternalLib_add_conf_arg,libcmis,'CPPUNIT_LIBS=""'))
diff --git a/libcmis/libcmis-0.1.0-autotools.patch b/libcmis/libcmis-0.1.0-autotools.patch
index 29e492e..05780ac 100644
--- a/libcmis/libcmis-0.1.0-autotools.patch
+++ b/libcmis/libcmis-0.1.0-autotools.patch
@@ -1,3 +1,26 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -42,6 +42,11 @@ AS_IF([test x"$GCC" = xyes], [
+ 	CXXFLAGS="$CXXFLAGS -Wall -pedantic"
+ ])
+ 
++AC_ARG_WITH([libxml2],
++	[AS_HELP_STRING([--with-libxml2=PREFIX], [look for the xml2 library in
++	 PREFIX/lib and headers in PREFIX/include])]
++)
++
+ LIBCMIS_API_VERSION=libcmis_api_version
+ AC_SUBST(LIBCMIS_API_VERSION)
+ 
+@@ -62,7 +67,7 @@ AC_SUBST(CURL_CFLAGS)
+ AC_SUBST(LIBCURL)
+ 
+ # Check for lixml2
+-AC_PATH_PROGS([TOOL_XML2_CONFIG], [xml2-config])
++AC_PATH_PROGS([TOOL_XML2_CONFIG], [xml2-config],, [$with_libxml2/bin:$PATH])
+ AS_IF([test -n "$TOOL_XML2_CONFIG"],
+ 	[XML2_CFLAGS=`$TOOL_XML2_CONFIG --cflags`
+ 	 XML2_LIBS=`$TOOL_XML2_CONFIG --libs`],
 --- bleh/config.sub	2011-09-27 22:48:43.000000000 +0200
 +++ blah/config.sub	2011-10-04 09:26:51.000000000 +0200
 @@ -4,7 +4,7 @@