diff --git a/configure.ac b/configure.ac index 9929416a188e..d7b831435713 100644 --- a/configure.ac +++ b/configure.ac @@ -1433,9 +1433,8 @@ libo_FUZZ_ARG_ENABLE(epm, ) libo_FUZZ_ARG_ENABLE(odk, - AS_HELP_STRING([--disable-odk], - [LibreOffice includes an ODK, office development kit which some packagers may - wish to build without.]) + AS_HELP_STRING([--enable-odk], + [Enable building the Office Development Kit, the part that extensions need to build against]) ) AC_ARG_ENABLE(mpl-subset, @@ -8866,7 +8865,7 @@ AC_SUBST(ENABLE_LWP) dnl =================================================================== dnl Check for building ODK dnl =================================================================== -if test "$enable_odk" = no; then +if test "$enable_odk" != yes; then unset DOXYGEN else if test "$with_doxygen" = no; then @@ -8901,7 +8900,7 @@ fi AC_SUBST([DOXYGEN]) AC_MSG_CHECKING([whether to build the ODK]) -if test "$enable_odk" = "" -o "$enable_odk" != "no"; then +if test "$enable_odk" = yes; then AC_MSG_RESULT([yes]) BUILD_TYPE="$BUILD_TYPE ODK" else diff --git a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf index 1f6ac36747de..03f39c46cde8 100644 --- a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf +++ b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf @@ -34,3 +34,4 @@ --with-package-format=archive --with-update-config=~/updater.ini --with-jdk-home=/etc/alternatives/java_sdk_11 +--enable-odk diff --git a/distro-configs/Jenkins/Linux_dev_master.conf b/distro-configs/Jenkins/Linux_dev_master.conf index f8919a0804fe..dcff6189cd85 100644 --- a/distro-configs/Jenkins/Linux_dev_master.conf +++ b/distro-configs/Jenkins/Linux_dev_master.conf @@ -3,3 +3,4 @@ --with-jdk-home=/etc/alternatives/java_sdk_11 CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ +--enable-odk diff --git a/distro-configs/Jenkins/Linux_rel_master.conf b/distro-configs/Jenkins/Linux_rel_master.conf index 988dff770063..150bf7df1f6e 100644 --- a/distro-configs/Jenkins/Linux_rel_master.conf +++ b/distro-configs/Jenkins/Linux_rel_master.conf @@ -2,3 +2,4 @@ --with-jdk-home=/etc/alternatives/java_sdk_11 CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ +--enable-odk diff --git a/distro-configs/Jenkins/Linux_ubsan_master.conf b/distro-configs/Jenkins/Linux_ubsan_master.conf index 86e65772c63a..bfc7465d50ff 100644 --- a/distro-configs/Jenkins/Linux_ubsan_master.conf +++ b/distro-configs/Jenkins/Linux_ubsan_master.conf @@ -26,3 +26,4 @@ --disable-compiler-plugins --disable-gtk3 --with-jdk-home=/etc/alternatives/java_sdk_11 +--enable-odk diff --git a/distro-configs/Jenkins/MacOSX_dev_master.conf b/distro-configs/Jenkins/MacOSX_dev_master.conf index dfc858b7c145..175b181e4001 100644 --- a/distro-configs/Jenkins/MacOSX_dev_master.conf +++ b/distro-configs/Jenkins/MacOSX_dev_master.conf @@ -1 +1,2 @@ --enable-debug +--enable-odk diff --git a/distro-configs/Jenkins/MacOSX_rel_master.conf b/distro-configs/Jenkins/MacOSX_rel_master.conf index e69de29bb2d1..3fce648ceb60 100644 --- a/distro-configs/Jenkins/MacOSX_rel_master.conf +++ b/distro-configs/Jenkins/MacOSX_rel_master.conf @@ -0,0 +1 @@ +--enable-odk diff --git a/distro-configs/Jenkins/PerfSuite_Linux.conf b/distro-configs/Jenkins/PerfSuite_Linux.conf index c8c30420afc3..84203a8bca03 100644 --- a/distro-configs/Jenkins/PerfSuite_Linux.conf +++ b/distro-configs/Jenkins/PerfSuite_Linux.conf @@ -8,3 +8,4 @@ --enable-mergelibs --with-jdk-home=/etc/alternatives/java_sdk_11 --enable-python=fully-internal +--enable-odk diff --git a/distro-configs/Jenkins/Win32_dev_master.conf b/distro-configs/Jenkins/Win32_dev_master.conf index 529ce926b229..c13caf23567f 100644 --- a/distro-configs/Jenkins/Win32_dev_master.conf +++ b/distro-configs/Jenkins/Win32_dev_master.conf @@ -1,2 +1,3 @@ --host=i686-pc-cygwin --enable-debug +--enable-odk diff --git a/distro-configs/Jenkins/Win32_rel_master.conf b/distro-configs/Jenkins/Win32_rel_master.conf index 0a894148ef87..23c5614c63bc 100644 --- a/distro-configs/Jenkins/Win32_rel_master.conf +++ b/distro-configs/Jenkins/Win32_rel_master.conf @@ -1,2 +1,3 @@ --host=i686-pc-cygwin +--enable-odk diff --git a/distro-configs/Jenkins/Win64_dev_master.conf b/distro-configs/Jenkins/Win64_dev_master.conf index dfc858b7c145..9992801f0d28 100644 --- a/distro-configs/Jenkins/Win64_dev_master.conf +++ b/distro-configs/Jenkins/Win64_dev_master.conf @@ -1 +1,3 @@ --enable-debug +--enable-odk + diff --git a/distro-configs/Jenkins/Win64_rel_master.conf b/distro-configs/Jenkins/Win64_rel_master.conf index e69de29bb2d1..3fce648ceb60 100644 --- a/distro-configs/Jenkins/Win64_rel_master.conf +++ b/distro-configs/Jenkins/Win64_rel_master.conf @@ -0,0 +1 @@ +--enable-odk diff --git a/distro-configs/Jenkins/android_common.conf b/distro-configs/Jenkins/android_common.conf index b35e5dca819c..9c9edec504da 100644 --- a/distro-configs/Jenkins/android_common.conf +++ b/distro-configs/Jenkins/android_common.conf @@ -4,3 +4,4 @@ --enable-android-editing CC_FOR_BUILD=/opt/rh/devtoolset-7/root/usr/bin/gcc CXX_FOR_BUILD=/opt/rh/devtoolset-7/root/usr/bin/g++ +--enable-odk diff --git a/distro-configs/Jenkins/linux_clang_dbgutil_64 b/distro-configs/Jenkins/linux_clang_dbgutil_64 index b67352cede47..0c83b89bcfe1 100644 --- a/distro-configs/Jenkins/linux_clang_dbgutil_64 +++ b/distro-configs/Jenkins/linux_clang_dbgutil_64 @@ -6,3 +6,4 @@ COMPILER_PLUGINS_CXX=ccache g++ -std=c++11 --disable-dependency-tracking --disable-split-debug --with-jdk-home=/etc/alternatives/java_sdk_11 +--enable-odk diff --git a/distro-configs/Jenkins/linux_gcc_release_64 b/distro-configs/Jenkins/linux_gcc_release_64 index 547b97a0de25..381ea68a0104 100644 --- a/distro-configs/Jenkins/linux_gcc_release_64 +++ b/distro-configs/Jenkins/linux_gcc_release_64 @@ -3,3 +3,4 @@ CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ --enable-kf5 --disable-dependency-tracking --with-jdk-home=/etc/alternatives/java_sdk_11 +--enable-odk diff --git a/distro-configs/Jenkins/linux_random.conf b/distro-configs/Jenkins/linux_random.conf index c4f546e02a43..dbfb76bf1e7b 100644 --- a/distro-configs/Jenkins/linux_random.conf +++ b/distro-configs/Jenkins/linux_random.conf @@ -1,2 +1,3 @@ --enable-fuzz-options --with-jdk-home=/etc/alternatives/java_sdk_11 +--enable-odk diff --git a/distro-configs/Jenkins/macosx_clang_dbgutil b/distro-configs/Jenkins/macosx_clang_dbgutil index 1e822c84b2a7..0a95e5db16eb 100644 --- a/distro-configs/Jenkins/macosx_clang_dbgutil +++ b/distro-configs/Jenkins/macosx_clang_dbgutil @@ -2,3 +2,4 @@ --disable-symbols --disable-dependency-tracking --enable-optimized +--enable-odk diff --git a/distro-configs/Jenkins/screenshot_linux.conf b/distro-configs/Jenkins/screenshot_linux.conf index aedde6c747fa..d6dd3d620700 100644 --- a/distro-configs/Jenkins/screenshot_linux.conf +++ b/distro-configs/Jenkins/screenshot_linux.conf @@ -1,2 +1,3 @@ --with-lang=ALL --with-jdk-home=/etc/alternatives/java_sdk_11 +--enable-odk diff --git a/distro-configs/Jenkins/screenshot_mac.conf b/distro-configs/Jenkins/screenshot_mac.conf index f93c7a7d1166..4536d229d860 100644 --- a/distro-configs/Jenkins/screenshot_mac.conf +++ b/distro-configs/Jenkins/screenshot_mac.conf @@ -1 +1,2 @@ --with-lang=ALL +--enable-odk diff --git a/distro-configs/Jenkins/screenshot_win.conf b/distro-configs/Jenkins/screenshot_win.conf index b6f8db572651..1c780f6991d9 100644 --- a/distro-configs/Jenkins/screenshot_win.conf +++ b/distro-configs/Jenkins/screenshot_win.conf @@ -1,2 +1,3 @@ --host=i686-pc-cygwin --with-lang=ALL +--enable-odk diff --git a/distro-configs/Jenkins/windows_msc_dbgutil_32 b/distro-configs/Jenkins/windows_msc_dbgutil_32 index 6d0e6df2facb..7e5b893a2aca 100644 --- a/distro-configs/Jenkins/windows_msc_dbgutil_32 +++ b/distro-configs/Jenkins/windows_msc_dbgutil_32 @@ -2,3 +2,4 @@ --enable-dbgutil --disable-symbols --disable-dependency-tracking +--enable-odk diff --git a/distro-configs/LibreOfficeCoverity.conf b/distro-configs/LibreOfficeCoverity.conf index 5b39bfd8bcd9..b97d0a0d4c2d 100644 --- a/distro-configs/LibreOfficeCoverity.conf +++ b/distro-configs/LibreOfficeCoverity.conf @@ -26,3 +26,4 @@ --with-hsqldb-jar=/home/coverity/hsqldb.jar --with-system-rhino --with-rhino-jar=/home/coverity/js.jar +--enable-odk diff --git a/distro-configs/LibreOfficeHaiku.conf b/distro-configs/LibreOfficeHaiku.conf index 46f497f7e348..87c287ce8277 100644 --- a/distro-configs/LibreOfficeHaiku.conf +++ b/distro-configs/LibreOfficeHaiku.conf @@ -3,4 +3,5 @@ --with-boost-libdir=/system/develop/lib --enable-readonly-installset --without-java ---without-system-jars \ No newline at end of file +--without-system-jars +--enable-odk diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf index fc7291ca7f9d..bcf7e9742f3f 100644 --- a/distro-configs/LibreOfficeMacOSX.conf +++ b/distro-configs/LibreOfficeMacOSX.conf @@ -8,3 +8,4 @@ --with-help=html --with-myspell-dicts --with-package-format=dmg +--enable-odk diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index f469db3dba05..92947bfc6526 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -12,3 +12,4 @@ --with-myspell-dicts --with-package-format=msi --enable-mergelibs +--enable-odk diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf index 7c3c1ae4e5ac..58ff734f3619 100644 --- a/distro-configs/LibreOfficeWin64.conf +++ b/distro-configs/LibreOfficeWin64.conf @@ -12,3 +12,4 @@ --with-myspell-dicts --with-package-format=msi --enable-mergelibs +--enable-odk diff --git a/distro-configs/LibreOfficeWinArm64.conf b/distro-configs/LibreOfficeWinArm64.conf index 6aface896786..509ed865fe5d 100644 --- a/distro-configs/LibreOfficeWinArm64.conf +++ b/distro-configs/LibreOfficeWinArm64.conf @@ -11,3 +11,4 @@ --with-myspell-dicts --with-package-format=msi --enable-mergelibs +--enable-odk