]>
Commit | Line | Data |
---|---|---|
68359394 JR |
1 | --- libreoffice-7.2.0.3/configure.ac~ 2021-08-10 19:27:48.000000000 +0200 |
2 | +++ libreoffice-7.2.0.3/configure.ac 2022-03-29 13:09:30.740802677 +0200 | |
3 | @@ -12759,7 +12759,8 @@ | |
4 | kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel" | |
5 | fi | |
6 | ||
7 | - kf5_test_include="KF5/kcoreaddons_version.h" | |
8 | + kf5_test_include_old="KF5/kcoreaddons_version.h" | |
9 | + kf5_test_include="KF5/KCoreAddons/kcoreaddons_version.h" | |
10 | kf5_test_library="libKF5CoreAddons.so" | |
11 | kf5_libdirs="$qt5_libdir $kf5_libdirs" | |
12 | ||
13 | @@ -12774,6 +12775,10 @@ | |
14 | AC_MSG_CHECKING([for KF5 headers]) | |
15 | kf5_incdir="no" | |
16 | for kf5_check in $kf5_incdirs; do | |
17 | + if test -r "$kf5_check/$kf5_test_include_old"; then | |
18 | + kf5_incdir="$kf5_check/KF5" | |
19 | + break | |
20 | + fi | |
21 | if test -r "$kf5_check/$kf5_test_include"; then | |
22 | kf5_incdir="$kf5_check/KF5" | |
23 | break |