@@ -399,17 +399,17 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITH_PKGCONFIG],[
399
399
qt4_modules="QtCore QtGui QtNetwork"
400
400
BITCOIN_QT_CHECK([
401
401
if test x$bitcoin_qt_want_version = xqt5 || ( test x$bitcoin_qt_want_version = xauto && test x$auto_priority_version = xqt5 ); then
402
- PKG_CHECK_MODULES([ QT ] , [ $qt5_modules] , [ QT_INCLUDES="$QT_CFLAGS"; have_qt=yes] ,[ have_qt=no] )
402
+ PKG_CHECK_MODULES([ QT5 ] , [ $qt5_modules] , [ QT_INCLUDES="$QT5_CFLAGS"; QT_LIBS="$QT5_LIBS" have_qt=yes] ,[ have_qt=no] )
403
403
elif test x$bitcoin_qt_want_version = xqt4 || ( test x$bitcoin_qt_want_version = xauto && test x$auto_priority_version = xqt4 ); then
404
- PKG_CHECK_MODULES([ QT ] , [ $qt4_modules] , [ QT_INCLUDES="$QT_CFLAGS" ; have_qt=yes] , [ have_qt=no] )
404
+ PKG_CHECK_MODULES([ QT4 ] , [ $qt4_modules] , [ QT_INCLUDES="$QT4_CFLAGS"; QT_LIBS="$QT4_LIBS" ; have_qt=yes] , [ have_qt=no] )
405
405
fi
406
406
407
407
dnl qt version is set to 'auto' and the preferred version wasn't found. Now try the other.
408
408
if test x$have_qt = xno && test x$bitcoin_qt_want_version = xauto; then
409
409
if test x$auto_priority_version = xqt5; then
410
- PKG_CHECK_MODULES([ QT ] , [ $qt4_modules] , [ QT_INCLUDES="$QT_CFLAGS" ; have_qt=yes; QT_LIB_PREFIX=Qt; bitcoin_qt_got_major_vers=4] , [ have_qt=no] )
410
+ PKG_CHECK_MODULES([ QT4 ] , [ $qt4_modules] , [ QT_INCLUDES="$QT4_CFLAGS"; QT_LIBS="$QT4_LIBS" ; have_qt=yes; QT_LIB_PREFIX=Qt; bitcoin_qt_got_major_vers=4] , [ have_qt=no] )
411
411
else
412
- PKG_CHECK_MODULES([ QT ] , [ $qt5_modules] , [ QT_INCLUDES="$QT_CFLAGS" ; have_qt=yes; QT_LIB_PREFIX=Qt5; bitcoin_qt_got_major_vers=5] , [ have_qt=no] )
412
+ PKG_CHECK_MODULES([ QT5 ] , [ $qt5_modules] , [ QT_INCLUDES="$QT5_CFLAGS"; QT_LIBS="$QT5_LIBS" ; have_qt=yes; QT_LIB_PREFIX=Qt5; bitcoin_qt_got_major_vers=5] , [ have_qt=no] )
413
413
fi
414
414
fi
415
415
if test x$have_qt != xyes; then
0 commit comments