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
Reviewed-on: https://gerrit.libreoffice.org/1791
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>

10 files changed, 17 insertions, 2 deletions

diff --git a/configure.ac b/configure.ac
index 7f001a663663..23ebf23562ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4503,7 +4503,7 @@ fi
 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 @@ fi
 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 b07359a01e65..6280c871879f 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 590d06902ee6..e4fdf4ce80b3 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 4ed55eec5b12..1934c1c7a2df 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 2ca107018a07..23ff683f3586 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 e14e9930b54b..e44899aee716 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 a56c09735d56..f149adcf90cd 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 19364be213d2..0fc5940aba33 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 35ca06140c1d..ee6386ead0d9 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 f552e94dd466..0c1404bc5e78 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