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

[Petr Mladek]

 config_host.mk.in |    1 +
 configure.ac      |   24 ++++++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit b70d4ad13b909265c54a9ff55f07224a14e9feb2
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Aug 28 16:09:39 2013 +0200

    add --with-help=common parameter to the configure option
    
    It allows to build only the common parts of the help, e.g.
    bundle the helpcontent-related icons.
    
    It is useful when the build content is built separately. For example,
    it is used to speed up the build of the main package in openSUSE
    Build Service.

diff --git a/config_host.mk.in b/config_host.mk.in
index 01fbdb8..094f730 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -238,6 +238,7 @@ export HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=@HAVE_NON_CONST_NPP_GETMIMEDESCRIPT
 export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@
 export HAVE_READDIR_R=@HAVE_READDIR_R@
 export HAVE_THREADSAFE_STATICS=@HAVE_THREADSAFE_STATICS@
+export HELP_COMMON_ONLY=@HELP_COMMON_ONLY@
 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 8dcdcd1..c8ae2d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1701,7 +1701,16 @@ AC_ARG_WITH(jdk-home,
 
 AC_ARG_WITH(help,
     AS_HELP_STRING([--with-help],
-        [Enable the build of help.]))
+        [Enable the build of help. There is a special parameter "common" that
+         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 entire local help
+                        	     --without-help     no local help (default)
+                        	     --with-help=common bundle common files for the local
+                        	                        help but do not build the whole help
+    ],
+,)
 
 AC_ARG_WITH(java,
     AS_HELP_STRING([--with-java],
@@ -4623,14 +4632,21 @@ fi
 AC_SUBST(DO_FETCH_TARBALLS)
 
 AC_MSG_CHECKING([whether to build help])
-if test "$with_help" = "yes" -a $_os != iOS -a $_os != Android; then
-    AC_MSG_RESULT([yes])
+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"
-    SCPDEFS="$SCPDEFS -DWITH_HELP"
     GIT_NEEDED_SUBMODULES="helpcontent2 $GIT_NEEDED_SUBMODULES"
+    if test "$with_help" = "common" ; then
+	HELP_COMMON_ONLY=TRUE
+	AC_MSG_RESULT([common only])
+    else
+	SCPDEFS="$SCPDEFS -DWITH_HELP"
+	AC_MSG_RESULT([yes])
+    fi
 else
     AC_MSG_RESULT([no])
 fi
+AC_SUBST(HELP_COMMON_ONLY)
 
 dnl Test whether to include MySpell dictionaries
 dnl ===================================================================