From d9776f66e39743617ae98dcd0679512e361a56da Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 11 Oct 2015 16:09:28 +0400 Subject: moved "uic" and "moc" executable names to the end of the configure checklist in order to prevent using Qt5 version of these tools --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 9bb2de2..78fec18 100644 --- a/configure.ac +++ b/configure.ac @@ -70,8 +70,8 @@ AS_IF([test "x$PICA_CLIENT_ENABLED" = "xyes"],[ PKG_CHECK_MODULES([QT_DEPENDENCIES], [QtCore QtGui QtSql]) AC_SUBST([QT_DEPENDENCIES_CFLAGS]) AC_SUBST([QT_DEPENDENCIES_LIBS]) -AC_CHECK_PROGS([UIC], [uic uic-qt4 uic4], [notfound]) -AC_CHECK_PROGS([MOC], [moc moc-qt4 moc4], [notfound]) +AC_CHECK_PROGS([UIC], [uic-qt4 uic4 uic], [notfound]) +AC_CHECK_PROGS([MOC], [moc-qt4 moc4 moc], [notfound]) #fail if not found ... AS_IF([test "x$UIC" = xnotfound],[AC_MSG_ERROR(["uic program not found. Please install Qt development package"])]) AS_IF([test "x$MOC" = xnotfound],[AC_MSG_ERROR(["moc program not found. Please install Qt development package"])]) -- cgit v1.2.1