configure.in | 3 +++ writerperfect/Module_writerperfect.mk | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+)
New commits: commit 9fb0ad21f467f6e8960e3559337f8ebdfa206ff9 Author: Tor Lillqvist <t...@iki.fi> Date: Tue Feb 28 00:29:14 2012 +0200 writerperfect depends on libwp[dgs], libcdr and libvisio Don't try to build libraries that depend on libraries we don't have. diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk index 4b2faad..dc2039c 100644 --- a/writerperfect/Module_writerperfect.mk +++ b/writerperfect/Module_writerperfect.mk @@ -28,13 +28,42 @@ $(eval $(call gb_Module_Module,writerperfect)) +ifneq (,$(filter YES,$(SYSTEM_LIBCDR))$(filter LIBCDR,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,writerperfect,\ Library_cdrimport \ +)) +endif + +ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE))) +ifneq (,$(filter YES,$(SYSTEM_LIBWPS))$(filter LIBWPS,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,writerperfect,\ Library_msworks \ +)) +endif +endif + +ifneq (,$(filter YES,$(SYSTEM_LIBVISIO))$(filter LIBVISIO,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,writerperfect,\ Library_visioimport \ +)) +endif + +ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,writerperfect,\ Library_wpft \ +)) +endif + +ifneq (,$(filter YES,$(SYSTEM_LIBWPG))$(filter LIBWPG,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,writerperfect,\ Library_wpgimport \ +)) +endif + +ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,writerperfect,\ StaticLibrary_writerperfect \ )) +endif # vim: set noet sw=4 ts=4: commit 44f3a76e979575a642373f3e1fb2db31612c5485 Author: Tor Lillqvist <t...@iki.fi> Date: Mon Feb 27 19:48:23 2012 +0200 libvisio depends on the LGPL libwpd and libwpg so bypass on iOS then diff --git a/configure.in b/configure.in index 8271431..e6e1205 100644 --- a/configure.in +++ b/configure.in @@ -5748,6 +5748,9 @@ if test "$with_system_libvisio" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_LIBVISIO=YES PKG_CHECK_MODULES( VISIO, libvisio-0.0 ) +elif test $_os = iOS; then + # libvisio depends on libwpd and libwpg and those are LGPL + AC_MSG_RESULT([none]) else AC_MSG_RESULT([internal]) SYSTEM_LIBVISIO=NO _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits