From 08c8b083a40ee348b6c8d3f8e192be1999f209f9 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 27 Apr 2022 17:11:14 +0300 Subject: [PATCH 23/23] macOS: Fix --with-qt5-framework-bin Reported by jdlh See osdn #44422 Signed-off-by: Marko Lindqvist --- m4/qt5-darwin.m4 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/m4/qt5-darwin.m4 b/m4/qt5-darwin.m4 index 10cc52e35f..26e41b2db8 100644 --- a/m4/qt5-darwin.m4 +++ b/m4/qt5-darwin.m4 @@ -6,10 +6,15 @@ AC_DEFUN([FC_QT5_DARWIN], AS_HELP_STRING([--with-qt5-framework], [path to root of Qt5 framework (MacOS, autodetected if wasn't specified)]), [qt5_path="${withval}"]) - AC_ARG_WITH([qt5_framework_bin], - AS_HELP_STRING([--with-qt5-framework-bin], [path to binares of Qt5 framework (MacOS X, autodetected if wasn't specified)])) + AC_ARG_WITH([qt5-framework-bin], + AS_HELP_STRING([--with-qt5-framework-bin], [path to binares of Qt5 framework (MacOS X, autodetected if wasn't specified)]), + [qt5_framework_bin="${withval}"]) - AC_CHECK_PROG([QTPATHS], [qtpaths], [qtpaths], [no]) + if test "x$qt5_framework_bin" = "x" ; then + AC_CHECK_PROG([QTPATHS], [qtpaths], [qtpaths], [no]) + elif test -x "$qt5_framework_bin/qtpaths" ; then + QTPATHS="$qt5_framework_bin/qtpaths" + fi if test "x$qt5_path" != "x" || test "x$QTPATHS" != "xno" ; then -- 2.35.1