From 952de50449bc183ed5c00bb9018b7a630c8a7bef Mon Sep 17 00:00:00 2001 From: Lukas Rucka Date: Tue, 5 Jun 2018 13:36:35 +0200 Subject: [PATCH] BUILD: Preffer QT5 qmake instead of qtselector one (+ use QtGui for dependencies) --- configure.ac | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index e7a1f2c4f..4585b21ec 100644 --- a/configure.ac +++ b/configure.ac @@ -2366,17 +2366,21 @@ PKG_CHECK_MODULES(QT, [qt_gui_dep], [FOUND_QT_DEP=yes], [FOUND_QT_DEP=no]) if test $qt_req != no -a $FOUND_QT_DEP = yes then # Retrieve Qt compilation and linker flags - CXXFLAGS="`$PKG_CONFIG --cflags-only-I QtCore ` $CXXFLAGS" - CFLAGS="`$PKG_CONFIG --cflags-only-I QtCore ` $CFLAGS" - LDFLAGS="`$PKG_CONFIG --libs-only-L QtCore ` $LDFLAGS" - LIBS="`$PKG_CONFIG --libs-only-l QtCore ` $LIBS" + CXXFLAGS="`$PKG_CONFIG --cflags-only-I Qt5Gui ` $CXXFLAGS" + CFLAGS="`$PKG_CONFIG --cflags-only-I Qt5Gui ` $CFLAGS" + LDFLAGS="`$PKG_CONFIG --libs-only-L Qt5Gui ` $LDFLAGS" + LIBS="`$PKG_CONFIG --libs-only-l Qt5Gui ` $LIBS" ADD_MODULE("display_preview", "src/video_display/preview.o", "$PREVIEW_DISP_LIBS") - AC_CHECK_PROGS(QMAKE, [qmake-qt5 qmake]) + AC_PATH_PROGS(QMAKE, [qmake-qt5 qmake], [:], [/usr/lib/qt5/bin:$PATH]) GUI_TARGET=gui/QT/uv-qt - qt_gui=yes + if test ":" = "$QMAKE"; then + qt_gui=no + else + qt_gui=yes + fi fi AC_SUBST(GUI_TARGET)