Mercurial > hg > tony

comparison acinclude.m4 @ 519:34668179c803

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update acinclude files to look for qt5-qmake as well as qmake-qt5
author Chris Cannam
date Sat, 30 Jan 2016 12:13:45 +0000
parents 4b9b7ff3f19c
children
comparison
equal deleted inserted replaced
518:a8df7cab0e32 519:34668179c803
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
253 259
254 AC_SUBST(HAVE_CXX11) 260 AC_SUBST(HAVE_CXX11)
255 fi 261 fi
256 ]) 262 ])
257 263
258