diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:29:03 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:29:03 +0000 |
| commit | 5a7157d319477830426797532e02ac39d3b859f4 (patch) | |
| tree | 3773f5ce209bee14a5643e98672e0f3828c71434 /configure.ac | |
| parent | Releasing progress-linux version 4:24.2.0-3~progress7.99u1. (diff) | |
| download | libreoffice-5a7157d319477830426797532e02ac39d3b859f4.tar.xz libreoffice-5a7157d319477830426797532e02ac39d3b859f4.zip | |
Merging upstream version 4:24.2.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 1 insertions, 17 deletions
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 |