[Libreoffice-commits] core.git: config_host.mk.in configure.ac

Stephan Bergmann sbergman at redhat.com
Fri Apr 20 09:42:51 UTC 2018


 config_host.mk.in |    1 -
 configure.ac      |    3 ---
 2 files changed, 4 deletions(-)

New commits:
commit 40180e56ff33c2217e333244607a7ac47552b533
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Apr 20 10:16:02 2018 +0200

    Remove unused HELP_COMMON_ONLY
    
    Unused ever since its introduction in b70d4ad13b909265c54a9ff55f07224a14e9feb2
    "add --with-help=common parameter to the configure option".  (Whether
    --with-help=common is also unused is a different question that needs to be
    addressed separately.)
    
    Change-Id: Ic7843c838242bfe95dba7388f63358973f42e5b7
    Reviewed-on: https://gerrit.libreoffice.org/53187
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/config_host.mk.in b/config_host.mk.in
index 8f9fb90c98e7..a031f962a3da 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -252,7 +252,6 @@ export HAVE_GPGCONF_SOCKETDIR=@HAVE_GPGCONF_SOCKETDIR@
 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@
diff --git a/configure.ac b/configure.ac
index 458f9f3c2735..5f14c5b99baa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4701,13 +4701,11 @@ fi
 AC_SUBST(DO_FETCH_TARBALLS)
 
 AC_MSG_CHECKING([whether to build help])
-HELP_COMMON_ONLY=FALSE
 if test -n "$with_help" -a "$with_help" != "no" -a $_os != iOS -a $_os != Android; then
     BUILD_TYPE="$BUILD_TYPE HELP"
     GIT_NEEDED_SUBMODULES="helpcontent2 $GIT_NEEDED_SUBMODULES"
     case "$with_help" in
     "common")
-        HELP_COMMON_ONLY=TRUE
         AC_MSG_RESULT([common only])
         ;;
     "html")
@@ -4728,7 +4726,6 @@ else
     AC_MSG_RESULT([no])
 fi
 AC_SUBST([ENABLE_HTMLHELP])
-AC_SUBST(HELP_COMMON_ONLY)
 AC_SUBST([HELP_ONLINE])
 
 dnl Test whether to include MySpell dictionaries


More information about the Libreoffice-commits mailing list