Skip to content

Commit 2c6b28d

Browse files
committed
build: Fix handling Qt framework on macOS again.
* m4/acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Re-establish handling of Qt being installed as a framework on macOS. A potential value set by the user for QT_LIBS was ignored before. So, continue doing that here. Fix regression from de7e2f3aaf00.
1 parent c19e223 commit 2c6b28d

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

m4/acinclude.m4

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2278,7 +2278,6 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_MSG_CHECKING([Qt version $1])
22782278
22792279
if test $build_qt_gui = yes; then
22802280
## Retrieve Qt compilation and linker flags
2281-
ac_octave_save_QT_LIBS="$QT_LIBS"
22822281
QT_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $QT_MODULES | $SED -e 's/^ *$//')"
22832282
QT_LDFLAGS="$($PKG_CONFIG --libs-only-L $QT_MODULES | $SED -e 's/^ *$//')"
22842283
QT_LIBS="$($PKG_CONFIG --libs-only-l --libs-only-other $QT_MODULES | $SED -e 's/^ *$//')"
@@ -2287,7 +2286,7 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_MSG_CHECKING([Qt version $1])
22872286
*darwin*)
22882287
## Qt might be installed in framework
22892288
ac_octave_QT_LIBS_only_l="$($PKG_CONFIG --libs-only-l $QT_MODULES | $SED -e 's/^ *$//')"
2290-
if test -z "$ac_octave_save_QT_LIBS" && test -z "$ac_octave_QT_LIBS_only_l"; then
2289+
if test -z "$ac_octave_QT_LIBS_only_l"; then
22912290
QT_LDFLAGS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`"
22922291
QT_LIBS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`"
22932292
fi

0 commit comments

Comments
 (0)