configure.ac | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit aac0f6081a5dcfb3c3d04b13f93d1c0c7813e272
Author: Đoàn Trần Công Danh <congdan...@gmail.com>
AuthorDate: Wed Jul 24 22:32:57 2024 +0700
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Mon Oct 7 11:21:57 2024 +0200
configure.ac: support cross-compiling with KDE 6
Those KDE version check can be moved into compile-time.
This change will also reduce the time to check when native compiling,
too, since we don't need to run the just-built binaries.
Change-Id: I0d60ade17b1ab5aaf4f729e39aba1345f088e6b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174512
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/configure.ac b/configure.ac
index 459ce88b930e..0b84d85c47f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13834,12 +13834,12 @@ then
save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $KF5_CFLAGS"
AC_MSG_CHECKING([whether KDE is >= 5.0])
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#include <kcoreaddons_version.h>
int main(int argc, char **argv) {
- if (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 0)
return 0;
- else return 1;
+ static_assert(KCOREADDONS_VERSION_MAJOR == 5 &&
KCOREADDONS_VERSION_MINOR >= 0);
+ return 0;
}
]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old])],[])
CXXFLAGS=$save_CXXFLAGS
@@ -13910,12 +13910,12 @@ then
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_RUN_IFELSE([AC_LANG_SOURCE([[
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#include <kcoreaddons_version.h>
int main(int argc, char **argv) {
- if (KCOREADDONS_VERSION_MAJOR == 6 || (KCOREADDONS_VERSION_MAJOR == 5
&& KCOREADDONS_VERSION_MINOR >= 240)) return 0;
- else return 1;
+ static_assert(KCOREADDONS_VERSION_MAJOR == 6 ||
(KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 240));
+ return 0;
}
]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old])],[])
CXXFLAGS=$save_CXXFLAGS
