Mercurial > hg > svcore

comparison acinclude.m4 @ 1206:659372323b45 tony-2.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge latest SV 3.0 branch code
author Chris Cannam
date Fri, 19 Aug 2016 15:58:57 +0100
parents 8a1328ab9c48
children
comparison
equal deleted inserted replaced
1136:e94719f941ba 1206:659372323b45
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