Mercurial > hg > svapp

comparison acinclude.m4 @ 548:baa11365ebdd bqaudioio

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch bqresample
author Chris Cannam
date Wed, 07 Dec 2016 11:51:42 +0000
parents d65ce7e55346
children
comparison
equal deleted inserted replaced
547:82d7e5cf7517 548:baa11365ebdd
67 67
68 if test x$QMAKE = x ; then 68 if test x$QMAKE = x ; then
69 AC_CHECK_PROG(QMAKE, qmake-qt5, $QTDIR/bin/qmake-qt5,,$QTDIR/bin/) 69 AC_CHECK_PROG(QMAKE, qmake-qt5, $QTDIR/bin/qmake-qt5,,$QTDIR/bin/)
70 fi 70 fi
71 if test x$QMAKE = x ; then 71 if test x$QMAKE = x ; then
72 AC_CHECK_PROG(QMAKE, qt5-qmake, $QTDIR/bin/qt5-qmake,,$QTDIR/bin/)
73 fi
74 if test x$QMAKE = x ; then
72 AC_CHECK_PROG(QMAKE, qmake, $QTDIR/bin/qmake,,$QTDIR/bin/) 75 AC_CHECK_PROG(QMAKE, qmake, $QTDIR/bin/qmake,,$QTDIR/bin/)
73 fi 76 fi
74 if test x$QMAKE = x ; then 77 if test x$QMAKE = x ; then
75 AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) 78 AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/)
76 fi 79 fi
77 if test x$QMAKE = x ; then 80 if test x$QMAKE = x ; then
78 AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) 81 AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH)
82 fi
83 if test x$QMAKE = x ; then
84 AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH)
79 fi 85 fi
80 if test x$QMAKE = x ; then 86 if test x$QMAKE = x ; then
81 AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) 87 AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH)
82 fi 88 fi
83 if test x$QMAKE = x ; then 89 if test x$QMAKE = x ; then