anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve detection of Qt6 libs

Browse Source 
We would miss the libraries specified by a full path when
also '-L' flags are present, as we would only take into
account those specified by '-l' flags.
This commit is contained in:
Enrico Forestieri 2021-10-16 19:09:30 +02:00
parent a29ced5577
commit 4d71d3d8a7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/qt.m4
View File

@ -454,7 +454,7 @@ EOF2
QT_LDFLAGS="-L`$QT_QMAKE -query QT_INSTALL_LIBS`" QT_LDFLAGS="-L`$QT_QMAKE -query QT_INSTALL_LIBS`"
QT_LIB="$qt_guilibs" QT_LIB="$qt_guilibs"
else else
QT_LIB=`echo $qt_guilibs | tr ' ' '\n' | grep -e "^-l" | tr '\n' ' '` QT_LIB=`echo $qt_guilibs | tr ' ' '\n' | grep -v "^-L" | tr '\n' ' '`
fi fi
QTLIB_VERSION=`$QT_QMAKE -v | grep "Qt version" | sed -e 's/.*\([[0-9]]\.[[0-9]]*\.[[0-9]]\).*/\1/'` QTLIB_VERSION=`$QT_QMAKE -v | grep "Qt version" | sed -e 's/.*\([[0-9]]\.[[0-9]]*\.[[0-9]]\).*/\1/'`
if test -z "$QT_LIB"; then if test -z "$QT_LIB"; then