configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 01479df14c14a4736dfbadf23c342b7ee835eba2
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Oct 7 11:24:26 2024 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Mon Oct 7 14:00:14 2024 +0200
configure: Clean up kf5/kf6 version checks
* Drop redundant "minor version >= 0" check
* For kf6, require version >= 6.0, i.e. drop support
for older pre-release development versions
Change-Id: Idffbc8eef513887727f6b256cb47a770294435bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174587
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/configure.ac b/configure.ac
index 0b84d85c47f8..026e81caeb85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13838,7 +13838,7 @@ then
#include <kcoreaddons_version.h>
int main(int argc, char **argv) {
- static_assert(KCOREADDONS_VERSION_MAJOR == 5 &&
KCOREADDONS_VERSION_MINOR >= 0);
+ static_assert(KCOREADDONS_VERSION_MAJOR == 5);
return 0;
}
]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old])],[])
@@ -13909,12 +13909,12 @@ then
save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $KF6_CFLAGS"
dnl KF6 development version as of 2023-06 uses version number 5.240
- AC_MSG_CHECKING([whether KDE is >= 5.240])
+ AC_MSG_CHECKING([whether KDE Frameworks version is >= 6.0])
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#include <kcoreaddons_version.h>
int main(int argc, char **argv) {
- static_assert(KCOREADDONS_VERSION_MAJOR == 6 ||
(KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 240));
+ static_assert(KCOREADDONS_VERSION_MAJOR == 6);
return 0;
}
]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old])],[])
