[Libreoffice-commits] core.git: config_host.mk.in configure.ac
David Tardon
dtardon at redhat.com
Thu Dec 7 12:51:31 UTC 2017
config_host.mk.in | 1 +
configure.ac | 7 +++++++
2 files changed, 8 insertions(+)
New commits:
commit d21267b50321749e894f4cb792b14b832ccbd7a3
Author: David Tardon <dtardon at redhat.com>
Date: Thu Dec 7 13:45:31 2017 +0100
allow to build online help too
Change-Id: I9b26f952dc681893b25712451535f4b539fd615d
diff --git a/config_host.mk.in b/config_host.mk.in
index 2281a90d891c..5a71f572258b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -246,6 +246,7 @@ export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@
export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@
export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@
export HELP_COMMON_ONLY=@HELP_COMMON_ONLY@
+export HELP_ONLINE=@HELP_ONLINE@
export HOST_PLATFORM=@host@
export HSQLDB_JAR=@HSQLDB_JAR@
export HSQLDB_USE_JDBC_4_1=@HSQLDB_USE_JDBC_4_1@
diff --git a/configure.ac b/configure.ac
index 91437559fbde..e2833c8bb7af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1866,6 +1866,7 @@ AC_ARG_WITH(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
--with-help=common bundle common files for the local
help but do not build the whole help
],
@@ -4604,6 +4605,11 @@ if test -n "$with_help" -a "$with_help" != "no" -a $_os != iOS -a $_os != Androi
ENABLE_HTMLHELP=TRUE
AC_MSG_RESULT([HTML])
;;
+ "online")
+ ENABLE_HTMLHELP=TRUE
+ HELP_ONLINE=TRUE
+ AC_MSG_RESULT([HTML])
+ ;;
*)
SCPDEFS="$SCPDEFS -DWITH_HELP"
AC_MSG_RESULT([yes])
@@ -4614,6 +4620,7 @@ else
fi
AC_SUBST([ENABLE_HTMLHELP])
AC_SUBST(HELP_COMMON_ONLY)
+AC_SUBST([HELP_ONLINE])
dnl Test whether to include MySpell dictionaries
dnl ===================================================================
More information about the Libreoffice-commits
mailing list