diff options
Diffstat (limited to '')
| -rwxr-xr-x | configure | 65 | ||||
| -rw-r--r-- | configure.ac | 18 |
2 files changed, 12 insertions, 71 deletions
@@ -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.0.3. +# Generated by GNU Autoconf 2.71 for LibreOffice 24.2.1.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.0.3' -PACKAGE_STRING='LibreOffice 24.2.0.3' +PACKAGE_VERSION='24.2.1.2' +PACKAGE_STRING='LibreOffice 24.2.1.2' PACKAGE_BUGREPORT='' PACKAGE_URL='http://documentfoundation.org/' @@ -751,7 +751,6 @@ BZIP2_LIBS BZIP2_CFLAGS PRIVACY_POLICY_URL ONLINEUPDATE_MAR_UPLOADURL -ONLINEUPDATE_MAR_SERVERURL ONLINEUPDATE_MAR_CERTIFICATEPATH ONLINEUPDATE_MAR_CERTIFICATENAME ONLINEUPDATE_MAR_CERTIFICATEDER @@ -1653,7 +1652,6 @@ with_online_update_mar_baseurl with_online_update_mar_certificateder with_online_update_mar_certificatename with_online_update_mar_certificatepath -with_online_update_mar_serverurl with_online_update_mar_uploadurl enable_extension_update enable_release_build @@ -2587,7 +2585,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.0.3 to adapt to many kinds of systems. +\`configure' configures LibreOffice 24.2.1.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2657,7 +2655,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LibreOffice 24.2.0.3:";; + short | recursive ) echo "Configuration of LibreOffice 24.2.1.2:";; esac cat <<\_ACEOF @@ -3075,11 +3073,6 @@ Optional Packages: --enable-online-update-mar. (Can be left off for debug purposes, even if that may render the feature non-functional.) - --with-online-update-mar-serverurl=... - Set the server URL value for - --enable-online-update-mar. (Can be left off for - debug purposes, even if that may render the feature - non-functional.) --with-online-update-mar-uploadurl=... Set the upload URL value for --enable-online-update-mar. (Can be left off for @@ -3095,7 +3088,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.0.3. Use only if you distribute an + 24.2.1.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 @@ -3923,7 +3916,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LibreOffice configure 24.2.0.3 +LibreOffice configure 24.2.1.2 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -4671,7 +4664,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.0.3, which was +It was created by LibreOffice $as_me 24.2.1.2, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -10258,30 +10251,6 @@ fi -# Check whether --with-online-update-mar-serverurl was given. -if test ${with_online_update_mar_serverurl+y} -then : - withval=$with_online_update_mar_serverurl; -else $as_nop - if test "$enable_fuzz_options" = yes; then - if test `expr $RANDOM % 2` = 1; then - with_online_update_mar_serverurl=yes - else - with_online_update_mar_serverurl=no - fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --with-online-update-mar-serverurl=$with_online_update_mar_serverurl" >&5 -printf "%s\n" "$as_me: Randomly set --with-online-update-mar-serverurl=$with_online_update_mar_serverurl" >&6;} - libo_fuzzed_with_online_update_mar_serverurl=yes - libo_fuzz_list="$libo_fuzz_list --with-online-update-mar-serverurl="'$with_online_update_mar_serverurl' - fi - - -fi - - - - - # Check whether --with-online-update-mar-uploadurl was given. if test ${with_online_update_mar_uploadurl+y} then : @@ -24064,7 +24033,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 24067 "configure" + %line 24036 "configure" section .text global _main,main _main: @@ -45398,18 +45367,6 @@ printf "%s\n" "no" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mar online update serverurl" >&5 -printf %s "checking for mar online update serverurl... " >&6; } -ONLINEUPDATE_MAR_SERVERURL=$with_online_update_mar_serverurl -if test -n "$ONLINEUPDATE_MAR_SERVERURL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mar online update uploadurl" >&5 printf %s "checking for mar online update uploadurl... " >&6; } ONLINEUPDATE_MAR_UPLOADURL=$with_online_update_mar_uploadurl @@ -48892,7 +48849,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.0.3, which was +This file was extended by LibreOffice $as_me 24.2.1.2, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -48961,7 +48918,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.0.3 +LibreOffice config.status 24.2.1.2 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 64e908a57e..598b9cf24a 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.0.3],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[24.2.1.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 @@ -1893,13 +1893,6 @@ libo_FUZZ_ARG_WITH(online-update-mar-certificatepath, non-functional.)]), ,) -libo_FUZZ_ARG_WITH(online-update-mar-serverurl, - AS_HELP_STRING([--with-online-update-mar-serverurl=...], - [Set the server URL value for --enable-online-update-mar. - (Can be left off for debug purposes, even if that may render the feature - non-functional.)]), -,) - libo_FUZZ_ARG_WITH(online-update-mar-uploadurl, AS_HELP_STRING([--with-online-update-mar-uploadurl=...], [Set the upload URL value for --enable-online-update-mar. @@ -13690,15 +13683,6 @@ else fi AC_SUBST(ONLINEUPDATE_MAR_CERTIFICATEPATH) -AC_MSG_CHECKING([for mar online update serverurl]) -ONLINEUPDATE_MAR_SERVERURL=$with_online_update_mar_serverurl -if test -n "$ONLINEUPDATE_MAR_SERVERURL"; then - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi -AC_SUBST(ONLINEUPDATE_MAR_SERVERURL) - AC_MSG_CHECKING([for mar online update uploadurl]) ONLINEUPDATE_MAR_UPLOADURL=$with_online_update_mar_uploadurl if test -n "$ONLINEUPDATE_MAR_UPLOADURL"; then |