[PATCH] default to --without-help and --without-myspell-dicts

[Norbert Thiebaud (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1791

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/1791/1

default to --without-help and --without-myspell-dicts

Updated the distro-configs so that the default change
does not impact build based on distro profile

The intent is that with this change of defaults
the build does only rely on core and does not need
any submodules. Making a initial build simpler
for new dev, since they won't be exposed to submodules
unless they really need them.

Change-Id: I446e912d607ce7358fd11f54a3de025dc3f25144
---
M configure.ac
M distro-configs/LibreOfficeAndroid.conf
M distro-configs/LibreOfficeAndroidX86.conf
M distro-configs/LibreOfficeLinux.conf
M distro-configs/LibreOfficeMacOSX.conf
M distro-configs/LibreOfficeMinGW.conf
M distro-configs/LibreOfficeOpenBSD.conf
M distro-configs/LibreOfficeWin32.conf
M distro-configs/LibreOfficeWin64.conf
M distro-configs/LibreOfficeiOS.conf
10 files changed, 17 insertions(+), 2 deletions(-)



diff --git a/configure.ac b/configure.ac
index 7f001a6..23ebf23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4503,7 +4503,7 @@
 AC_SUBST(DO_FETCH_TARBALLS)
 
 AC_MSG_CHECKING([whether to build help])
-if test "$with_help" != "no" -a $_os != iOS -a $_os != Android; then
+if test "$with_help" = "yes" -a $_os != iOS -a $_os != Android; then
     AC_MSG_RESULT([yes])
     BUILD_TYPE="$BUILD_TYPE HELP"
     SCPDEFS="$SCPDEFS -DWITH_HELP"
@@ -4515,7 +4515,7 @@
 dnl Test whether to include MySpell dictionaries
 dnl ===================================================================
 AC_MSG_CHECKING([whether to include MySpell dictionaries])
-if test -z "$with_myspell_dicts" -o "$with_myspell_dicts" = "yes"; then
+if test "$with_myspell_dicts" = "yes"; then
     AC_MSG_RESULT([yes])
     WITH_MYSPELL_DICTS=YES
     BUILD_TYPE="$BUILD_TYPE DICTIONARIES"
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index b07359a..6280c87 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -21,3 +21,4 @@
 --without-helppack-integration
 --without-myspell-dicts
 --with-build-platform-configure-options=--disable-liblangtag
+--with-help
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index 590d069..e4fdf4c 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -21,3 +21,4 @@
 --without-helppack-integration
 --without-myspell-dicts
 --with-build-platform-configure-options=--disable-liblangtag
+--with-help
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 4ed55ee..1934c1c 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -1,5 +1,6 @@
 --with-vendor=The Document Foundation
 --with-system-dicts
+--with-myspell-dicts
 --without-unix-wrapper
 --without-system-zlib
 --without-system-stdlibs
@@ -14,6 +15,7 @@
 --without-system-cairo
 --without-system-postgresql
 --without-junit
+--with-help
 --without-helppack-integration
 --with-linker-hash-style=both
 --with-fonts
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 2ca1070..23ff683 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -10,3 +10,5 @@
 --enable-online-update
 --without-system-postgresql
 --disable-gtk
+--with-help
+--with-myspell-dicts
diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf
index e14e993..e44899a 100644
--- a/distro-configs/LibreOfficeMinGW.conf
+++ b/distro-configs/LibreOfficeMinGW.conf
@@ -29,3 +29,5 @@
 --disable-mozilla
 --disable-postgresql-sdbc
 --disable-gtk
+--with-help
+--with-myspell-dicts
diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf
index a56c097..f149adc 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -45,3 +45,4 @@
 --without-system-mozilla
 --without-unix-wrapper
 --without-system-libwpd
+--with-help
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index 19364be..0fc5940 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -15,3 +15,5 @@
 --enable-online-update
 --enable-win-mozab-driver
 --disable-build-mozab
+--with-help
+--with-myspell-dicts
diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf
index 35ca061..ee6386e 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -4,3 +4,5 @@
 --disable-gtk
 --enable-scripting-beanshell
 --enable-scripting-javascript
+--with-help
+--with-myspell-dicts
diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf
index f552e94..0c1404bc5 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -22,3 +22,5 @@
 --without-java
 --without-junit
 --without-ppds
+--with-help
+--with-myspell-dicts

-- 
To view, visit https://gerrit.libreoffice.org/1791
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I446e912d607ce7358fd11f54a3de025dc3f25144
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud <nthiebaud at gmail.com>