[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-3' - configure.ac
Michael Stahl (via logerrit)
logerrit at kemper.freedesktop.org
Tue Jul 7 08:37:33 UTC 2020
configure.ac | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 327b2da4fb1211fb5c46b5a52d679f3ddb0de618
Author: Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Jul 7 10:12:39 2020 +0200
Commit: Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Tue Jul 7 10:13:38 2020 +0200
configure: try to fail early if qt5 header QtCore/qconfig-32.h missing
Unfortunately configure passes successfully if qt5-qtbase-devel-*.x86_64
is installed but the host cpu is i686.
Change-Id: I6afcec6e18294daa48e92e4f3879d96365ce337f
diff --git a/configure.ac b/configure.ac
index df7094a8145c..2a32ba1cd42d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11348,6 +11348,9 @@ then
if test "x$qt5_incdir" = "xno"; then
AC_MSG_ERROR([Qt5 headers not found. Please specify the root of your Qt5 installation by exporting QT5DIR before running "configure".])
fi
+ # check for scenario: qt5-qtbase-devel-*.86_64 installed but host is i686
+ AC_CHECK_HEADER(QtCore/qconfig.h, [],
+ [AC_MSG_ERROR(qconfig.h header not found.)], [])
AC_MSG_CHECKING([for Qt5 libraries])
qt5_libdir="no"
More information about the Libreoffice-commits
mailing list