diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-07-08 09:51:56 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-07-08 14:57:21 +0200 |
| commit | fa654ada6f6a9bd3daf9639119759164cd9ff5a3 (patch) | |
| tree | d8f30219e3f430872163e911bc13b16cf02f7cdb | |
| parent | 9abeaaff50e9f6f15c0ef1be5fdabb6fbe1b7a5c (diff) | |
configure: try to fix qconfig.h check
Change-Id: Ie88d36d2f00c920a2d2a3e8fc6a84fdca4552b86
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98314
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 0be03f347d2a..ba23b7211e27 100644 --- a/configure.ac +++ b/configure.ac @@ -11930,8 +11930,13 @@ 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_LANG_PUSH([C++]) + save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="${CPPFLAGS} -I${qt5_incdir}" AC_CHECK_HEADER(QtCore/qconfig.h, [], [AC_MSG_ERROR(qconfig.h header not found.)], []) + CPPFLAGS=$save_CPPFLAGS + AC_LANG_POP([C++]) AC_MSG_CHECKING([for Qt5 libraries]) qt5_libdir="no" |