diff options
| author | Gabor Kelemen <kelemeng@ubuntu.com> | 2016-11-07 12:00:06 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-11-08 14:56:41 +0000 |
| commit | 16efafc27ac2162d798ef68c4f09b946c66b9bfc (patch) | |
| tree | ab17efca2537a1a1727dcd1c23fea87554fdf790 | |
| parent | c0da11fb1c1cbc701e64a4b3f1f3c6506ef663d2 (diff) | |
Drop more OxygenOffice bits
Follow up to 8dc38d9ded92960eda46343b67da8a8b95404b5a
Here we drop some --help descriptions and the rest of
removed extensions from the Jenkins config file
Change-Id: Ie1520adf2c48c2dc714b00c53ba0055f1deb3c62
Reviewed-on: https://gerrit.libreoffice.org/30697
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | configure.ac | 25 | ||||
| -rw-r--r-- | distro-configs/Jenkins/Linux_ubsan_master.conf | 5 |
2 files changed, 0 insertions, 30 deletions
diff --git a/configure.ac b/configure.ac index 66fdc0d3adec..5c11dc627507 100644 --- a/configure.ac +++ b/configure.ac @@ -1354,26 +1354,6 @@ AC_ARG_ENABLE(64-bit, [Build a 64-bit LibreOffice on platforms where the normal build is 32-bit. At the moment meaningful only for iOS and Windows.]), ,) -AC_ARG_ENABLE(extra-gallery, - AS_HELP_STRING([--enable-extra-gallery], - [Add extra gallery content.]), -,) - -AC_ARG_ENABLE(extra-template, - AS_HELP_STRING([--enable-extra-template], - [Add extra template content.]), -,) - -AC_ARG_ENABLE(extra-sample, - AS_HELP_STRING([--enable-extra-sample], - [Add extra sample content.]), -,) - -AC_ARG_ENABLE(extra-font, - AS_HELP_STRING([--enable-extra-font], - [Add extra font content.]), -,) - AC_ARG_ENABLE(online-update, AS_HELP_STRING([--enable-online-update], [Enable the online update service that will check for new versions of @@ -2227,11 +2207,6 @@ AC_ARG_WITH(alloc, Note that on FreeBSD/NetBSD system==jemalloc]), ,) -AC_ARG_WITH(sun-templates, - AS_HELP_STRING([--with-sun-templates], - [Integrate Sun template packages.]), -,) - AC_ARG_WITH(parallelism, AS_HELP_STRING([--with-parallelism], [Number of jobs to run simultaneously during build. Parallel builds can diff --git a/distro-configs/Jenkins/Linux_ubsan_master.conf b/distro-configs/Jenkins/Linux_ubsan_master.conf index 959b5d7a28ae..55cdb13d4ae2 100644 --- a/distro-configs/Jenkins/Linux_ubsan_master.conf +++ b/distro-configs/Jenkins/Linux_ubsan_master.conf @@ -13,10 +13,6 @@ --enable-ext-nlpsolver --enable-ext-numbertext --enable-ext-wiki-publisher ---enable-extra-font ---enable-extra-gallery ---enable-extra-sample ---enable-extra-template --enable-gstreamer-1-0 --enable-python=fully-internal --enable-release-build @@ -26,7 +22,6 @@ --with-jpeg-turbo --with-lang=de en-US fi hu --with-myspell-dicts ---with-sun-templates --without-system-libpng --without-system-libxml --without-system-zlib |