[Libreoffice-commits] core.git: configure.ac

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Mon May 18 09:08:51 UTC 2020


 configure.ac |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 6089755d197528d071906846c58a397add0876a5
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon May 18 12:06:29 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon May 18 12:08:00 2020 +0300

    Revert "I am told we don't want to use old style help files any longer"
    
    Pitäkää tunkkinne.
    
    This reverts commit 1f6b7678d52e1bf9092e3ce2cf7b7c4ffdcb2ba2.

diff --git a/configure.ac b/configure.ac
index 171dd945a241..1d531f32edec 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 new HTML local help
+                          Usage:     --with-help    build the old 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,9 +5049,8 @@ 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([HTML])
+        AC_MSG_RESULT([yes])
         ;;
     *)
         AC_MSG_ERROR([Unknown --with-help=$with_help])


More information about the Libreoffice-commits mailing list