diff -r ac867877999e -r 45ed276ba7a4 configure --- a/configure Wed Mar 26 20:42:02 2025 +0100 +++ b/configure Wed Mar 26 21:15:20 2025 +0100 @@ -311,27 +311,26 @@ if [ -z "$lang_cpp" ] ; then break fi + if [ -z "$PKG_CONFIG" ]; then + break + fi if which qmake-qt5 > /dev/null ; then : else break fi - TEMP_CFLAGS="$TEMP_CFLAGS -DUI_QT5" - if tmp_flags=`qmake-qt5 -o - /dev/null | grep "DEFINES " | sed "s/DEFINES[ ]*=//g"` ; then - TEMP_CFLAGS="$TEMP_CFLAGS $tmp_flags" + if test_pkg_config "Qt5Widgets" "" "" "" ; then + TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags Qt5Widgets`" + TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs Qt5Widgets`" else break fi - if tmp_flags=`qmake-qt5 -o - /dev/null | grep "INCPATH " | sed "s/INCPATH[ ]*=//g"` ; then - TEMP_CFLAGS="$TEMP_CFLAGS $tmp_flags" - else - break - fi - if tmp_flags=`qmake-qt5 -o - /dev/null | grep "LIBS " | sed "s/LIBS[ ]*=//g"` ; then - TEMP_LDFLAGS="$TEMP_LDFLAGS $tmp_flags" - else - break - fi + TEMP_CFLAGS="$TEMP_CFLAGS -DUI_QT5" + cat >> $TEMP_DIR/make.mk << __EOF__ +# Dependency: qt5 +QMAKE = qmake-qt5 +QT_PRO_FILE = qt5.pro +__EOF__ print_check_msg "$dep_checked_qt5" "yes\n" dep_checked_qt5=1 return 1