configure: Prefer specific known-good versions of Qt metacompiler tools

This commit is contained in:
Luke Dashjr 2013-09-08 01:22:32 +00:00
parent 56ba02aa2a
commit 9a09c0091c

View File

@ -143,10 +143,10 @@ AC_PATH_PROG(LCOV, lcov)
AC_PATH_PROG(JAVA, java) AC_PATH_PROG(JAVA, java)
AC_PATH_PROG(GENHTML, genhtml) AC_PATH_PROG(GENHTML, genhtml)
AC_PATH_PROG([GIT], [git]) AC_PATH_PROG([GIT], [git])
AC_PATH_PROGS([MOC], [moc moc-qt4],, $qt_bin_path:$PATH) AC_PATH_PROGS([MOC], [moc-qt4 moc4 moc],, $qt_bin_path:$PATH)
AC_PATH_PROGS([UIC], [uic uic-qt4],, $qt_bin_path:$PATH) AC_PATH_PROGS([UIC], [uic-qt4 uic4 uic],, $qt_bin_path:$PATH)
AC_PATH_PROG([RCC], [rcc],, $qt_bin_path:$PATH) AC_PATH_PROGS([RCC], [rcc-qt4 rcc4 rcc],, $qt_bin_path:$PATH)
AC_PATH_PROG([LRELEASE], [lrelease],, $qt_bin_path:$PATH) AC_PATH_PROGS([LRELEASE], [lrelease-qt4 lrelease4 lrelease],, $qt_bin_path:$PATH)
AC_PATH_PROG([PROTOC], [protoc],, $protoc_bin_path:$PATH) AC_PATH_PROG([PROTOC], [protoc],, $protoc_bin_path:$PATH)
AC_PATH_PROG(CCACHE,ccache) AC_PATH_PROG(CCACHE,ccache)
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG