diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2013-09-08 01:22:32 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2013-09-10 22:26:09 +0000 |
commit | 9a09c0091c33a8f22f48b5e6e5b8f3b400c43ff3 (patch) | |
tree | 9a226da153a5fea2bc87a474b5e86b4edbd81dbb /configure.ac | |
parent | 56ba02aa2a0bb56cbdfeb87ec47c0c5b61f9bb06 (diff) |
configure: Prefer specific known-good versions of Qt metacompiler tools
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index f8d52e616a..066134a6f5 100644 --- a/configure.ac +++ b/configure.ac @@ -143,10 +143,10 @@ AC_PATH_PROG(LCOV, lcov) AC_PATH_PROG(JAVA, java) AC_PATH_PROG(GENHTML, genhtml) AC_PATH_PROG([GIT], [git]) -AC_PATH_PROGS([MOC], [moc moc-qt4],, $qt_bin_path:$PATH) -AC_PATH_PROGS([UIC], [uic uic-qt4],, $qt_bin_path:$PATH) -AC_PATH_PROG([RCC], [rcc],, $qt_bin_path:$PATH) -AC_PATH_PROG([LRELEASE], [lrelease],, $qt_bin_path:$PATH) +AC_PATH_PROGS([MOC], [moc-qt4 moc4 moc],, $qt_bin_path:$PATH) +AC_PATH_PROGS([UIC], [uic-qt4 uic4 uic],, $qt_bin_path:$PATH) +AC_PATH_PROGS([RCC], [rcc-qt4 rcc4 rcc],, $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(CCACHE,ccache) PKG_PROG_PKG_CONFIG |