From a69991d17ea0e197ebf8b729ee0792ac75e34dbc Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 21 May 2021 16:18:08 +0300 Subject: [PATCH 58/58] MacOS: Respect user set MOCCMD See osdn #42342 Signed-off-by: Marko Lindqvist --- m4/qt5-darwin.m4 | 2 +- m4/qt6-darwin.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/qt5-darwin.m4 b/m4/qt5-darwin.m4 index 725fe4ab0e..9a0b57c7f2 100644 --- a/m4/qt5-darwin.m4 +++ b/m4/qt5-darwin.m4 @@ -27,7 +27,7 @@ AC_DEFUN([FC_QT5_DARWIN], AC_LANG_POP([C++]) if test "x$qt5_libs" = "xyes" ; then - MOCCMD="$qt5_framework_bin/moc" + AS_IF([test "x$MOCCMD" = "x"], [MOCCMD="$qt5_framework_bin/moc"]) AS_IF([test -x $MOCCMD], [fc_qt5_usable=true], [fc_qt5_usable=false]) else fc_qt5_usable=false diff --git a/m4/qt6-darwin.m4 b/m4/qt6-darwin.m4 index ff243ed04b..95848bda14 100644 --- a/m4/qt6-darwin.m4 +++ b/m4/qt6-darwin.m4 @@ -27,7 +27,7 @@ AC_DEFUN([FC_QT6_DARWIN], AC_LANG_POP([C++]) if test "x$qt6_libs" = "xyes" ; then - MOCCMD="$qt6_framework_bin/moc" + AS_IF([test "x$MOCCMD" = "x"], [MOCCMD="$qt6_framework_bin/moc"]) AS_IF([test -x $MOCCMD], [fc_qt6_usable=true], [fc_qt6_usable=false]) else fc_qt6_usable=false -- 2.30.2