summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xconfigure51
-rw-r--r--configure.ac30
2 files changed, 53 insertions, 28 deletions
diff --git a/configure b/configure
index 54fd9a83c3..5555ffaac7 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for LibreOffice 24.2.1.2.
+# Generated by GNU Autoconf 2.71 for LibreOffice 24.2.2.2.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -608,8 +608,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='LibreOffice'
PACKAGE_TARNAME='libreoffice'
-PACKAGE_VERSION='24.2.1.2'
-PACKAGE_STRING='LibreOffice 24.2.1.2'
+PACKAGE_VERSION='24.2.2.2'
+PACKAGE_STRING='LibreOffice 24.2.2.2'
PACKAGE_BUGREPORT=''
PACKAGE_URL='http://documentfoundation.org/'
@@ -1225,6 +1225,7 @@ OFFICEOTRON_JAR
OFFICEOTRON
ODFVALIDATOR_JAR
ODFVALIDATOR
+MODULAR_JAVA
JAVA_TARGET_VER
JAVA_SOURCE_VER
JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD
@@ -2585,7 +2586,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures LibreOffice 24.2.1.2 to adapt to many kinds of systems.
+\`configure' configures LibreOffice 24.2.2.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -2655,7 +2656,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of LibreOffice 24.2.1.2:";;
+ short | recursive ) echo "Configuration of LibreOffice 24.2.2.2:";;
esac
cat <<\_ACEOF
@@ -3088,7 +3089,7 @@ Optional Packages:
Define the product name. Default is LibreOffice.
--with-package-version='3.1.4.5'
Define the package version. Default is
- 24.2.1.2. Use only if you distribute an
+ 24.2.2.2. Use only if you distribute an
own build for macOS.
--with-main-module=<writer/calc>
Specify which main module to build for wasm. Default
@@ -3264,7 +3265,7 @@ Optional Packages:
"both". The default value is "gnu" if supported on
the build system, and "sysv" otherwise.
--with-jdk-home=<absolute path to JDK home>
- If you have installed JDK 17 or later on your system
+ 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,
@@ -3916,7 +3917,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-LibreOffice configure 24.2.1.2
+LibreOffice configure 24.2.2.2
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -4664,7 +4665,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by LibreOffice $as_me 24.2.1.2, which was
+It was created by LibreOffice $as_me 24.2.2.2, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -19760,7 +19761,9 @@ rm -rf conftest*
fi
fi
- 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
@@ -22459,7 +22462,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
- as_fn_error $? "No JDK found, pass the --with-jdk-home option (or fix the path) pointing to a $WIN_HOST_BITS-bit JDK >= 17" "$LINENO" 5
+ as_fn_error $? "No JDK found, pass the --with-jdk-home option (or fix the path) pointing to a $WIN_HOST_BITS-bit JDK >= 8" "$LINENO" 5
fi
fi
@@ -22565,6 +22568,7 @@ fi
# 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
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the installed JDK" >&5
@@ -22584,8 +22588,8 @@ printf %s "checking the installed JDK... " >&6; }
_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
- as_fn_error $? "JDK is too old, you need at least 17 ($_jdk_ver < 170000)" "$LINENO" 5
+ if test "$_jdk_ver" -lt 10800; then
+ as_fn_error $? "JDK is too old, you need at least 8 ($_jdk_ver < 10800)" "$LINENO" 5
fi
if test "$_jdk_ver" -ge 180000; then
JDK_SECURITYMANAGER_DISALLOWED=TRUE
@@ -22598,13 +22602,21 @@ printf %s "checking the installed JDK... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found $JAVA_HOME (JDK $_jdk)" >&5
printf "%s\n" "found $JAVA_HOME (JDK $_jdk)" >&6; }
+ if test "$_jdk_ver" -ge 90000; then
+ MODULAR_JAVA=TRUE
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Modular jars will not be built. They need at least Java 9 ($_jdk_ver < 90000)" >&5
+printf "%s\n" "$as_me: WARNING: Modular jars will not be built. They need at least Java 9 ($_jdk_ver < 90000)" >&2;}
+ 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
- as_fn_error $? "Java not found. You need at least JDK 17" "$LINENO" 5
+ as_fn_error $? "Java not found. You need at least JDK 8" "$LINENO" 5
fi
else
if test -z "$ENABLE_JAVA"; then
@@ -23056,6 +23068,7 @@ fi
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable export file validation" >&5
printf %s "checking whether to enable export file validation... " >&6; }
if test "$with_export_validation" != "no"; then
@@ -24033,7 +24046,7 @@ printf "%s\n" "$NAFLAGS" >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the assembler ($NASM $NAFLAGS) works" >&5
printf %s "checking whether the assembler ($NASM $NAFLAGS) works... " >&6; }
cat > conftest.asm << EOF
- %line 24036 "configure"
+ %line 24049 "configure"
section .text
global _main,main
_main:
@@ -30618,7 +30631,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
as_fn_error $? "PYTHON_VERSION ${PYTHON_VERSION} but no matching file in download.lst" "$LINENO" 5
fi
@@ -44950,7 +44963,7 @@ printf "%s\n" "$kf6_libdir" >&6; }
as_fn_error $? "KF6 libraries not found. Please specify the root of your KF6 installation by exporting KF6DIR before running \"configure\"." "$LINENO" 5
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")
@@ -48849,7 +48862,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by LibreOffice $as_me 24.2.1.2, which was
+This file was extended by LibreOffice $as_me 24.2.2.2, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -48918,7 +48931,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-LibreOffice config.status 24.2.1.2
+LibreOffice config.status 24.2.2.2
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
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")
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-19 13:22:10 +0000