strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

configure: Clean up kf5/kf6 version checks

Browse source 
* 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.weghorn@posteo.de>
Tested-by: Jenkins
This commit is contained in:
Michael Weghorn 2024-10-07 11:24:26 +02:00
parent 5599ec55f0
commit 01479df14c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -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])],[])