scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-22 01:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makefile: small fixes

Browse Source 
- use qmake only if really detected
- use qmake-based lookup only for Qt >= 6
This commit is contained in:
Martin Pulec
2021-04-19 08:53:02 +02:00
parent 15b119801c
commit c66fa9f7ea
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@@ -2747,11 +2747,16 @@ if test "x$QMAKE" = "x"; then
AC_PATH_PROGS(QMAKE, [qmake-qt5 qmake], [:], [/usr/lib/qt5/bin:$PATH])
fi
if test "$QMAKE" -a "$QMAKE" != ":"
then
QMAKE_VERSION=`$QMAKE -v | sed -n 's/.*Qt version \([^ ]*\).*/\1/p'`
fi
# Qt deps not found with pkg-config but qmake found (eg. in Qt 6)
if test $FOUND_QT_DEP = no -a -n "$QMAKE"
if test $FOUND_QT_DEP = no -a -n "$QMAKE_VERSION" && expr "$QMAKE_VER" \> 6 >/dev/null
then
touch qt.pro
qmake qt.pro -o Make.qt
$QMAKE qt.pro -o Make.qt
printf 'print-libs:\n\t@echo $(LIBS)\n\n' >> Make.qt
printf 'print-cflags:\n\t@echo $(INCPATH) $(CFLAGS)\n\n' >> Make.qt
QT_CFLAGS=$(make -f Make.qt print-cflags)