onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-05-10 19:14:57 +02:00
Code Issues Releases Wiki Activity

Detect qmake-qt5 automatically.

Browse Source
This commit is contained in:
Patrick Monnerat
2018-03-05 20:00:55 +01:00
parent 10fd1f5425
commit a8f0f68636
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.in
View File

@@ -67,12 +67,15 @@ if test -n "$with_qmake"; then
fi fi
else else
AC_PATH_PROG(QMAKE, qmake, ,[$EXTENDED_PATH]) AC_PATH_PROG(QMAKE, qmake, ,[$EXTENDED_PATH])
if test -z "$QMAKE"; then
AC_PATH_PROG(QMAKE, qmake-qt5, ,[$EXTENDED_PATH])
if test -z "$QMAKE"; then if test -z "$QMAKE"; then
AC_PATH_PROG(QMAKE, qmake-qt4, ,[$EXTENDED_PATH]) AC_PATH_PROG(QMAKE, qmake-qt4, ,[$EXTENDED_PATH])
if test -z "$QMAKE"; then if test -z "$QMAKE"; then
AC_MSG_ERROR("Could not find qmake") AC_MSG_ERROR("Could not find qmake")
fi fi
fi fi
fi
fi fi
AC_MSG_CHECKING(checking version of QT this qmake is part of) AC_MSG_CHECKING(checking version of QT this qmake is part of)