[Libreoffice-commits] core.git: configure.ac

[Michael Stahl (via logerrit)]

 configure.ac |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit d68fc8d10da9047534f0e7a2d5ebc59f13745442
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Jul 7 10:36:13 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Tue Jul 7 18:39:49 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: Ib155d6f91676c12a480eed2f0d4d38c05377e909
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98240
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/configure.ac b/configure.ac
index cd1e6a52c615..f0492335a9d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11929,6 +11929,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"