diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 598b9cf24a..14463a944f 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[24.2.1.2],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[24.2.2.2],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard @@ -2569,7 +2569,7 @@ AC_ARG_WITH(linker-hash-style, AC_ARG_WITH(jdk-home, AS_HELP_STRING([--with-jdk-home=<absolute path to JDK home>], - [If you have installed JDK 17 or later on your system please supply the + [If you have installed JDK 8 or later on your system please supply the path here. Note that this is not the location of the java command but the location of the entire distribution. In case of cross-compiling, this is the JDK of the host os. Use --with-build-platform-configure-options @@ -7197,7 +7197,9 @@ if test "$_os" != "WINNT"; then dnl Check for large file support AC_SYS_LARGEFILE - if test -n "$ac_cv_sys_file_offset_bits" -a "$ac_cv_sys_file_offset_bits" != "no"; then + if test -n "$ac_cv_sys_largefile_opts" -a "$ac_cv_sys_largefile_opts" != "none needed" -a "$ac_cv_sys_largefile_opts" != "support not detected"; then + LFS_CFLAGS="$ac_cv_sys_largefile_opts" + elif test -n "$ac_cv_sys_file_offset_bits" -a "$ac_cv_sys_file_offset_bits" != "no"; then LFS_CFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" fi if test -n "$ac_cv_sys_large_files" -a "$ac_cv_sys_large_files" != "no"; then @@ -8622,7 +8624,7 @@ if test "$ENABLE_JAVA" != ""; then fi if ! test -f "$with_jdk_home/lib/jvm.lib" -a -f "$with_jdk_home/bin/java.exe"; then - AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option (or fix the path) pointing to a $WIN_HOST_BITS-bit JDK >= 17]) + AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option (or fix the path) pointing to a $WIN_HOST_BITS-bit JDK >= 8]) fi fi @@ -8687,6 +8689,7 @@ dnl =================================================================== # Whether all the complexity here actually is needed any more or not, no idea. JDK_SECURITYMANAGER_DISALLOWED= +MODULAR_JAVA= if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then _gij_longver=0 AC_MSG_CHECKING([the installed JDK]) @@ -8707,8 +8710,8 @@ if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED '/^$/d' | $SED s/[[-A-Za-z]]*//` _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` - if test "$_jdk_ver" -lt 170000; then - AC_MSG_ERROR([JDK is too old, you need at least 17 ($_jdk_ver < 170000)]) + if test "$_jdk_ver" -lt 10800; then + AC_MSG_ERROR([JDK is too old, you need at least 8 ($_jdk_ver < 10800)]) fi dnl TODO: Presumably, the Security Manager will not merely be disallowed, but be dnl completely removed in some Java version > 18 (see @@ -8723,13 +8726,21 @@ if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then fi AC_MSG_RESULT([found $JAVA_HOME (JDK $_jdk)]) + dnl Check whether the build Java supports modules + if test "$_jdk_ver" -ge 90000; then + MODULAR_JAVA=TRUE + else + AC_MSG_WARN([Modular jars will not be built. They need at least Java 9 ($_jdk_ver < 90000)]) + add_warning "Modular jars will not be built. They need at least Java 9 ($_jdk_ver < 90000)" + fi + # set to limit VM usage for JunitTests JAVAIFLAGS=-Xmx64M # set to limit VM usage for javac JAVACFLAGS=-J-Xmx128M fi else - AC_MSG_ERROR([Java not found. You need at least JDK 17]) + AC_MSG_ERROR([Java not found. You need at least JDK 8]) fi else if test -z "$ENABLE_JAVA"; then @@ -9033,6 +9044,7 @@ AC_SUBST(JDK_FOR_BUILD) AC_SUBST(JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD) AC_SUBST(JAVA_SOURCE_VER) AC_SUBST(JAVA_TARGET_VER) +AC_SUBST(MODULAR_JAVA) dnl =================================================================== @@ -10032,7 +10044,7 @@ if test \( "$cross_compiling" = yes -a -z "$PYTHON_FOR_BUILD" \) -o "$enable_pyt SYSTEM_PYTHON= PYTHON_VERSION_MAJOR=3 PYTHON_VERSION_MINOR=8 - PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.18 + PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.19 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in download.lst]) fi @@ -13493,7 +13505,7 @@ then AC_MSG_ERROR([KF6 libraries not found. Please specify the root of your KF6 installation by exporting KF6DIR before running "configure".]) fi - KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n -I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem -I$kf6_incdir/KIO -I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets -I$kf6_incdir/KIOFileWidgets -I$qt6_incdir -I$qt6_incdir/QtCore -I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets -I$qt6_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING" + KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n -I$kf6_incdir/KConfig -I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem -I$kf6_incdir/KIO -I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets -I$kf6_incdir/KIOFileWidgets -I$qt6_incdir -I$qt6_incdir/QtCore -I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets -I$qt6_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING" KF6_LIBS="-L$kf6_libdir -lKF6CoreAddons -lKF6I18n -lKF6ConfigCore -lKF6WindowSystem -lKF6KIOCore -lKF6KIOWidgets -lKF6KIOFileWidgets -L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets -lQt6Network" KF6_CFLAGS=$(printf '%s' "$KF6_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") |