Repository.mk | 2 -
config_host.mk.in | 2 +
configure.ac | 35 ++++++++++++++++++++++++-
lotuswordpro/Module_lotuswordpro.mk | 4 ++
postprocess/Rdb_services.mk | 4 ++
solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 -
6 files changed, 45 insertions(+), 4 deletions(-)
New commits:
commit db52fd7123b35d9c3e0ff5868a58195add2a455e
Author: Michael Meeks <michael.me...@suse.com>
Date: Tue Apr 23 14:18:34 2013 +0100
Add license filtering to configure.
Change-Id: Icd53c6ccfcca25d828d79ad62d1e075869998850
diff --git a/Repository.mk b/Repository.mk
index a709a99..0ccc03d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -276,7 +276,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
hwp \
- lwpft \
+ $(if $(ENABLE_LWP),lwpft) \
msword \
swd \
swui \
diff --git a/config_host.mk.in b/config_host.mk.in
index ad33e7d..82dfd50 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -135,6 +135,7 @@ export ENABLE_KDE=@ENABLE_KDE@
export ENABLE_LIBLANGTAG=@ENABLE_LIBLANGTAG@
export ENABLE_LOCKDOWN=@ENABLE_LOCKDOWN@
export ENABLE_LTO=@ENABLE_LTO@
+export ENABLE_LWP=@ENABLE_LWP@
export ENABLE_MACOSX_SANDBOX=@ENABLE_MACOSX_SANDBOX@
export ENABLE_MEDIAWIKI=@ENABLE_MEDIAWIKI@
export ENABLE_MINIMIZER=@ENABLE_MINIMIZER@
@@ -352,6 +353,7 @@ export MKDEPENDSOLVER=TRUE
export ML_EXE=@ML_EXE@
export MOC4=@MOC4@
export MOC=@MOC@
+export MPL_SUBSET=@MPL_SUBSET@
export MSM_PATH=@MSM_PATH@
export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@
export MSPUB_LIBS=$(gb_SPACE)@MSPUB_LIBS@
diff --git a/configure.ac b/configure.ac
index 34cc0b3..a002d93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -747,7 +747,7 @@ AC_ARG_ENABLE(pch,
AC_ARG_ENABLE(win-mozab-driver,
AS_HELP_STRING([--enable-win-mozab-driver],
- [LibreOffice includes a driver to connect to Mozilla
+ [LibreOffice includes a driver to connect to Mozilla
address books under Windows, to build with this version, use this
option.])
)
@@ -763,6 +763,11 @@ AC_ARG_ENABLE(odk,
wish to build without.])
)
+AC_ARG_ENABLE(mpl-subset,
+ AS_HELP_STRING([--enable-mpl-subset],
+ [Don't compile any pieces which are not MPL or more liberrally
licensed])
+)
+
AC_ARG_ENABLE(mathmldtd,
AS_HELP_STRING([--enable-mathmldtd],
[Enable bundling of (modified) MathML 1.01 DTD.])
@@ -1152,6 +1157,11 @@ AC_ARG_ENABLE(postgresql-sdbc,
[Disable the build of the PostgreSQL-SDBC driver.])
)
+AC_ARG_ENABLE(lotuswordpro,
+ AS_HELP_STRING([--disable-lotuswordpro],
+ [Disable the build of the Lotus Word Pro filter.]),
+,enable_lotuswordpro=yes)
+
AC_ARG_ENABLE(coretext,
AS_HELP_STRING([--enable-coretext],
[Use CoreText framework on Mac (instead of ATSU).
@@ -6923,6 +6933,29 @@ printf ("hello world\n");
fi
AC_SUBST(WINEGCC)
+ENABLE_LWP=
+if test "$enable_lotuswordpro" = "yes"; then
+ ENABLE_LWP="TRUE"
+ SCPDEFS="$SCPDEFS -DDISABLE_LWP"
+fi
+AC_SUBST(ENABLE_LWP)
+
+AC_MSG_CHECKING([MPL subset])
+MPL_SUBSET=
+if test "$enable_mpl_subset" = "yes"; then
+ if test "x$enable_postgresql_sdbc" != "xno"; then
+ AC_MSG_ERROR([need to --disable-postgresql-sdbc.])
+ fi
+ if test "$enable_lotuswordpro" = "yes"; then
+ AC_MSG_ERROR([need to --disable-lotuswordpro.])
+ fi
+ MPL_SUBSET="TRUE"
+ AC_MSG_RESULT([only])
+else
+ AC_MSG_RESULT([no restrictions])
+fi
+AC_SUBST(MPL_SUBSET)
+
dnl ===================================================================
dnl Check for gperf
dnl ===================================================================
diff --git a/lotuswordpro/Module_lotuswordpro.mk
b/lotuswordpro/Module_lotuswordpro.mk
index 5dfcc14..538702e 100644
--- a/lotuswordpro/Module_lotuswordpro.mk
+++ b/lotuswordpro/Module_lotuswordpro.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Module_Module,lotuswordpro))
+ifeq ($(ENABLE_LWP),TRUE)
+
$(eval $(call gb_Module_add_targets,lotuswordpro,\
Library_lwpft \
))
@@ -17,4 +19,6 @@ $(eval $(call gb_Module_add_check_targets,lotuswordpro,\
CppunitTest_lotuswordpro_test_lotuswordpro \
))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 62103a0..58bb368 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -55,7 +55,9 @@ $(eval $(call gb_Rdb_add_components,services,\
lingucomponent/source/spellcheck/spell/spell \
lingucomponent/source/thesaurus/libnth/lnth \
linguistic/source/lng \
- lotuswordpro/util/lwpfilter \
+ $(if $(ENABLE_LWP), \
+ lotuswordpro/util/lwpfilter \
+ ) \
oox/util/oox \
package/source/xstor/xstor \
package/util/package2 \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index c106f1f..72108c5 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -81,7 +81,7 @@ gb_EXTRAMERGEDLIBS := \
$(if $(filter-out ANDROID IOS,$(OS)),ldapbe2) \
lnth \
$(if $(filter-out ANDROID IOS,$(OS)),log) \
- lwpft \
+ $(if $(ENABLE_LWP),lwpft) \
$(call gb_Helper_optional,DESKTOP,migrationoo2) \
$(call gb_Helper_optional,DESKTOP,migrationoo3) \
$(call gb_Helper_optional,DBCONNECTIVITY,mork) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
