configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
New commits: commit 1f6b7678d52e1bf9092e3ce2cf7b7c4ffdcb2ba2 Author: Tor Lillqvist <t...@collabora.com> AuthorDate: Wed May 13 18:15:48 2020 +0300 Commit: Tor Lillqvist <t...@collabora.com> CommitDate: Mon May 18 08:07:43 2020 +0200 I am told we don't want to use old style help files any longer Make --with-help mean the same as --with-help=html to avoid generating such unintentionally. Change-Id: Ie53b3604f53c3301cb196b2239dce6f0c08acbd3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94145 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <t...@collabora.com> diff --git a/configure.ac b/configure.ac index 1d531f32edec..171dd945a241 100644 --- a/configure.ac +++ b/configure.ac @@ -2021,7 +2021,7 @@ AC_ARG_WITH(help, can be used to bundle only the common part, .e.g help-specific icons. This is useful when you build the helpcontent separately.]) [ - Usage: --with-help build the old local help + Usage: --with-help build the new HTML local help --without-help no local help (default) --with-help=html build the new HTML local help --with-help=online build the new HTML online help @@ -5049,8 +5049,9 @@ if test -n "$with_help" -a "$with_help" != "no" -a $_os != iOS -a $_os != Androi AC_MSG_RESULT([HTML]) ;; yes) + ENABLE_HTMLHELP=TRUE SCPDEFS="$SCPDEFS -DWITH_HELP" - AC_MSG_RESULT([yes]) + AC_MSG_RESULT([HTML]) ;; *) AC_MSG_ERROR([Unknown --with-help=$with_help]) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits