From 989e6b00f22de4bdfb9e47248d47054b220a9012 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 4 Dec 2021 09:51:05 +0200 Subject: [PATCH 44/44] Qt6: Automatically search 'moc' from /usr/lib/qt6/libexec/ See osdn #43331 Signed-off-by: Marko Lindqvist --- m4/qt6.m4 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/m4/qt6.m4 b/m4/qt6.m4 index 84ed7a578e..435204913f 100644 --- a/m4/qt6.m4 +++ b/m4/qt6.m4 @@ -171,10 +171,12 @@ AC_DEFUN([FC_QT6_VALIDATE_MOC], [ dnl Try to find a Qt 6 'moc' if MOCCMD isn't set. dnl Test that the supplied MOCCMD is a Qt 6 'moc' if it is set. AS_IF([test "x$MOCCMD" = "x"], - [FC_QT6_TRY_MOC([moc], - [FC_QT6_TRY_MOC([qtchooser -run-tool=moc -qt=6], - [FC_QT6_TRY_MOC([moc-qt6], - [MOCCMD=""])])])], + [for mocpath in "moc" "qtchooser -run-tool=moc -qt=6" "moc-qt6" "/usr/lib/qt6/libexec/moc" + do + if test "x$MOCCMD" = "x" ; then + FC_QT6_TRY_MOC([$mocpath]) + fi + done], [FC_QT6_TRY_MOC([$MOCCMD], AC_MSG_ERROR(["MOCCMD set to a bad value ($MOCCMD)"]))]) -- 2.33.0