configure: improve QPA check for cross compilation

Prefix the $QPA_INCLUDE_PATH with $PKG_CONFIG_SYSROOT_DIR just
like when checking for opencv dir.

https://bugzilla.gnome.org/show_bug.cgi?id=776399
This commit is contained in:
Stepan Salenikovich 2016-12-22 11:48:05 -05:00 committed by Sebastian Dröge
parent 3e519937a1
commit db7f8ec3b9

View file

@ -2885,7 +2885,7 @@ AG_GST_CHECK_FEATURE(QT, [Qt elements], qt, [
HAVE_QT_WINDOWING="no" HAVE_QT_WINDOWING="no"
QT_VERSION="`$PKG_CONFIG --modversion Qt5Core`" QT_VERSION="`$PKG_CONFIG --modversion Qt5Core`"
QPA_INCLUDE_PATH=`$PKG_CONFIG --variable=includedir Qt5Core`/QtGui/${QT_VERSION}/QtGui QPA_INCLUDE_PATH=`$PKG_CONFIG --variable=includedir Qt5Core`/QtGui/${QT_VERSION}/QtGui
AS_IF([test -f "$QPA_INCLUDE_PATH/qpa/qplatformnativeinterface.h"], [ AS_IF([test -f "$PKG_CONFIG_SYSROOT_DIR/$QPA_INCLUDE_PATH/qpa/qplatformnativeinterface.h"], [
QT_CFLAGS="$QT_CFLAGS -I$QPA_INCLUDE_PATH" QT_CFLAGS="$QT_CFLAGS -I$QPA_INCLUDE_PATH"
HAVE_QT_QPA_HEADER="yes" HAVE_QT_QPA_HEADER="yes"
], [AC_MSG_NOTICE([Cannot find QPA])]) ], [AC_MSG_NOTICE([Cannot find QPA])])