Kaydet (Commit) db52fd71 authored tarafından Michael Meeks's avatar Michael Meeks

Add license filtering to configure.

Change-Id: Icd53c6ccfcca25d828d79ad62d1e075869998850
üst 16385c4d
......@@ -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 \
......
......@@ -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@
......
......@@ -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 ===================================================================
......
......@@ -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:
......@@ -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 \
......
......@@ -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) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment