@@ -171,7 +171,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
171
171
] )
172
172
173
173
if test "x$qt_bin_path" = x; then
174
- qt_bin_path="`$PKG_CONFIG --variable=host_bins Qt5Core 2>/dev/null`"
174
+ qt_bin_path="`$PKG_CONFIG --variable=host_bins ${qt_lib_prefix}Core 2>/dev/null`"
175
175
fi
176
176
177
177
if test "x$use_hardening" != xno; then
@@ -338,19 +338,19 @@ dnl
338
338
dnl Inputs: no inputs.
339
339
dnl Outputs: QT_LIBS is prepended.
340
340
AC_DEFUN ( [ _BITCOIN_QT_CHECK_STATIC_LIBS] , [
341
- PKG_CHECK_MODULES([ QTACCESSIBILITY] , [ Qt5AccessibilitySupport ${qt_lib_suffix}] , [ QT_LIBS="-lQt5AccessibilitySupport${qt_lib_suffix} $QT_LIBS"] )
342
- PKG_CHECK_MODULES([ QTDEVICEDISCOVERY] , [ Qt5DeviceDiscoverySupport ${qt_lib_suffix}] , [ QT_LIBS="-lQt5DeviceDiscoverySupport${qt_lib_suffix} $QT_LIBS"] )
343
- PKG_CHECK_MODULES([ QTEVENTDISPATCHER] , [ Qt5EventDispatcherSupport ${qt_lib_suffix}] , [ QT_LIBS="-lQt5EventDispatcherSupport${qt_lib_suffix} $QT_LIBS"] )
344
- PKG_CHECK_MODULES([ QTFB] , [ Qt5FbSupport ${qt_lib_suffix}] , [ QT_LIBS="-lQt5FbSupport${qt_lib_suffix} $QT_LIBS"] )
345
- PKG_CHECK_MODULES([ QTFONTDATABASE] , [ Qt5FontDatabaseSupport ${qt_lib_suffix}] , [ QT_LIBS="-lQt5FontDatabaseSupport${qt_lib_suffix} $QT_LIBS"] )
346
- PKG_CHECK_MODULES([ QTTHEME] , [ Qt5ThemeSupport ${qt_lib_suffix}] , [ QT_LIBS="-lQt5ThemeSupport${qt_lib_suffix} $QT_LIBS"] )
341
+ PKG_CHECK_MODULES([ QTACCESSIBILITY] , [ ${qt_lib_prefix}AccessibilitySupport ${qt_lib_suffix}] , [ QT_LIBS="-lQt5AccessibilitySupport${qt_lib_suffix} $QT_LIBS"] )
342
+ PKG_CHECK_MODULES([ QTDEVICEDISCOVERY] , [ ${qt_lib_prefix}DeviceDiscoverySupport ${qt_lib_suffix}] , [ QT_LIBS="-lQt5DeviceDiscoverySupport${qt_lib_suffix} $QT_LIBS"] )
343
+ PKG_CHECK_MODULES([ QTEVENTDISPATCHER] , [ ${qt_lib_prefix}EventDispatcherSupport ${qt_lib_suffix}] , [ QT_LIBS="-lQt5EventDispatcherSupport${qt_lib_suffix} $QT_LIBS"] )
344
+ PKG_CHECK_MODULES([ QTFB] , [ ${qt_lib_prefix}FbSupport ${qt_lib_suffix}] , [ QT_LIBS="-lQt5FbSupport${qt_lib_suffix} $QT_LIBS"] )
345
+ PKG_CHECK_MODULES([ QTFONTDATABASE] , [ ${qt_lib_prefix}FontDatabaseSupport ${qt_lib_suffix}] , [ QT_LIBS="-lQt5FontDatabaseSupport${qt_lib_suffix} $QT_LIBS"] )
346
+ PKG_CHECK_MODULES([ QTTHEME] , [ ${qt_lib_prefix}ThemeSupport ${qt_lib_suffix}] , [ QT_LIBS="-lQt5ThemeSupport${qt_lib_suffix} $QT_LIBS"] )
347
347
if test "x$TARGET_OS" = xlinux; then
348
- PKG_CHECK_MODULES([ QTXCBQPA] , [ Qt5XcbQpa ] , [ QT_LIBS="$QTXCBQPA_LIBS $QT_LIBS"] )
348
+ PKG_CHECK_MODULES([ QTXCBQPA] , [ ${qt_lib_prefix}XcbQpa ] , [ QT_LIBS="$QTXCBQPA_LIBS $QT_LIBS"] )
349
349
elif test "x$TARGET_OS" = xdarwin; then
350
- PKG_CHECK_MODULES([ QTCLIPBOARD] , [ Qt5ClipboardSupport ${qt_lib_suffix}] , [ QT_LIBS="-lQt5ClipboardSupport${qt_lib_suffix} $QT_LIBS"] )
351
- PKG_CHECK_MODULES([ QTGRAPHICS] , [ Qt5GraphicsSupport ${qt_lib_suffix}] , [ QT_LIBS="-lQt5GraphicsSupport${qt_lib_suffix} $QT_LIBS"] )
350
+ PKG_CHECK_MODULES([ QTCLIPBOARD] , [ ${qt_lib_prefix}ClipboardSupport ${qt_lib_suffix}] , [ QT_LIBS="-lQt5ClipboardSupport${qt_lib_suffix} $QT_LIBS"] )
351
+ PKG_CHECK_MODULES([ QTGRAPHICS] , [ ${qt_lib_prefix}GraphicsSupport ${qt_lib_suffix}] , [ QT_LIBS="-lQt5GraphicsSupport${qt_lib_suffix} $QT_LIBS"] )
352
352
elif test "x$TARGET_OS" = xwindows; then
353
- PKG_CHECK_MODULES([ QTWINDOWSUIAUTOMATION] , [ Qt5WindowsUIAutomationSupport ${qt_lib_suffix}] , [ QT_LIBS="-lQt5WindowsUIAutomationSupport${qt_lib_suffix} $QT_LIBS"] )
353
+ PKG_CHECK_MODULES([ QTWINDOWSUIAUTOMATION] , [ ${qt_lib_prefix}WindowsUIAutomationSupport ${qt_lib_suffix}] , [ QT_LIBS="-lQt5WindowsUIAutomationSupport${qt_lib_suffix} $QT_LIBS"] )
354
354
fi
355
355
] )
356
356
0 commit comments