Mercurial > hg > tony

diff 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
line wrap: on
line diff
--- a/acinclude.m4	Fri Oct 23 08:51:54 2015 +0100
+++ b/acinclude.m4	Sat Jan 30 12:13:45 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
@@ -255,4 +261,3 @@
   fi
 ])
 
-