Mercurial > hg > svcore
diff acinclude.m4 @ 1157:8a1328ab9c48
Update acinclude files to look for qt5-qmake as well as qmake-qt5
| author | Chris Cannam |
|---|---|
| date | Sat, 30 Jan 2016 12:05:14 +0000 |
| parents | dbb7f0ab011e |
| children |
line wrap: on
line diff
--- a/acinclude.m4 Thu Oct 22 11:53:06 2015 +0100 +++ b/acinclude.m4 Sat Jan 30 12:05:14 2016 +0000 @@ -69,6 +69,9 @@ AC_CHECK_PROG(QMAKE, qmake-qt5, $QTDIR/bin/qmake-qt5,,$QTDIR/bin/) fi if test x$QMAKE = x ; then + AC_CHECK_PROG(QMAKE, qt5-qmake, $QTDIR/bin/qt5-qmake,,$QTDIR/bin/) +fi +if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake, $QTDIR/bin/qmake,,$QTDIR/bin/) fi if test x$QMAKE = x ; then @@ -78,6 +81,9 @@ AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then + AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) +fi +if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) fi if test x$QMAKE = x ; then