diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-10-05 12:06:35 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-10-05 12:07:32 +0200 |
| commit | 63135c903cf3e9dfca28bb47358e272c5c30cad4 (patch) | |
| tree | 4b5f07d54f506a97d40741632e81da80351cf329 /libcmis | |
| parent | a1a205eda8cca6cb05fe466579a8018e7c3eb141 (diff) | |
Make libcmis build with MinGW.
Diffstat (limited to 'libcmis')
| -rw-r--r-- | libcmis/ExternalLib_libcmis.mk | 9 | ||||
| -rw-r--r-- | libcmis/libcmis-0.1.0-autotools.patch | 23 |
2 files changed, 32 insertions, 0 deletions
diff --git a/libcmis/ExternalLib_libcmis.mk b/libcmis/ExternalLib_libcmis.mk index 797dea5475d4..77c5bde87548 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 29e492ea7fa8..05780ac09f0e 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 @@ |