diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-24 14:12:18 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-06-22 14:25:51 +0200 |
| commit | 14069d84174ca7a4e60db4d75912903e9679b643 (patch) | |
| tree | adf1a9138c9a1cb942e885d59f1d392a8f9eeb3b /RepositoryModule_build.mk | |
| parent | fix indent (diff) | |
| download | core-14069d84174ca7a4e60db4d75912903e9679b643.tar.gz core-14069d84174ca7a4e60db4d75912903e9679b643.zip | |
configure: Improve help-options handling
This patch includes:
* A README.help.md as a general documentation for the different
help types, the LO code and help-related build options.
* Adds --disable-xmlhelp for removing the xmlhelp support from the
build. Disable for iOS, Android and Emscripten. This was partly
included in HAVE_FEATURE_DESKTOP before.
* Rename WITH_HELP define to WITH_HELPPACKS, which reflects the
actual usage AFAIK.
* Depend --with-omindex on --with-help=online and don't override
the --with-help setting. Error out on conflicting options.
* Depend --with-helppack-integration on build help variants, which
actually result in help packs.
Kind of reverts commit 2c38ea6d16b910294220cefaf8ae6a0683e6405a
("Building without --with-help is not supposed to disable help
functionality").
Change-Id: Ie4cb73905b3ed94e991d9f1bd75cfbd6de9da385
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116222
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'RepositoryModule_build.mk')
| -rw-r--r-- | RepositoryModule_build.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index 3ea89f432c41..de906d605c53 100644 --- a/RepositoryModule_build.mk +++ b/RepositoryModule_build.mk @@ -87,10 +87,8 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\ xmloff \ xmlscript \ ) \ - $(call gb_Helper_optional_for_host,DESKTOP, \ - helpcompiler \ - xmlhelp \ - ) \ + $(call gb_Helper_optionals_or,HELPTOOLS XMLHELP,helpcompiler) \ + $(call gb_Helper_optional,XMLHELP,xmlhelp) \ $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ )) |