@@ -104,8 +104,8 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
104104 _BITCOIN_QT_FIND_STATIC_PLUGINS
105105 AC_DEFINE ( QT_STATICPLUGIN , 1 , [ Define this symbol if qt plugins are static] )
106106 if test "x$TARGET_OS" != xandroid; then
107- _BITCOIN_QT_CHECK_STATIC_PLUGINS([ Q_IMPORT_PLUGIN(QMinimalIntegrationPlugin)] ,[ -lqminimal] )
108- AC_DEFINE ( QT_QPA_PLATFORM_MINIMAL , 1 , [ Define this symbol if the minimal qt platform exists] )
107+ _BITCOIN_QT_CHECK_STATIC_PLUGINS([ Q_IMPORT_PLUGIN(QMinimalIntegrationPlugin)] ,[ -lqminimal] )
108+ AC_DEFINE ( QT_QPA_PLATFORM_MINIMAL , 1 , [ Define this symbol if the minimal qt platform exists] )
109109 fi
110110 if test "x$TARGET_OS" = xwindows; then
111111 _BITCOIN_QT_CHECK_STATIC_PLUGINS([ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)] ,[ -lqwindows] )
@@ -299,26 +299,26 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
299299 if test -d "$qt_plugin_path/platforms/android"; then
300300 QT_LIBS="$QT_LIBS -L$qt_plugin_path/platforms/android -lqtfreetype -lEGL"
301301 fi
302- m4_ifdef ( [ PKG_CHECK_MODULES] ,[
303- if test x$bitcoin_cv_qt58 = xno; then
304- PKG_CHECK_MODULES([ QTPLATFORM] , [ Qt5PlatformSupport] , [ QT_LIBS="$QTPLATFORM_LIBS $QT_LIBS"] )
305- else
306- PKG_CHECK_MODULES([ QTFONTDATABASE] , [ Qt5FontDatabaseSupport] , [ QT_LIBS="-lQt5FontDatabaseSupport $QT_LIBS"] )
307- PKG_CHECK_MODULES([ QTEVENTDISPATCHER] , [ Qt5EventDispatcherSupport] , [ QT_LIBS="-lQt5EventDispatcherSupport $QT_LIBS"] )
308- PKG_CHECK_MODULES([ QTTHEME] , [ Qt5ThemeSupport] , [ QT_LIBS="-lQt5ThemeSupport $QT_LIBS"] )
309- PKG_CHECK_MODULES([ QTDEVICEDISCOVERY] , [ Qt5DeviceDiscoverySupport] , [ QT_LIBS="-lQt5DeviceDiscoverySupport $QT_LIBS"] )
310- PKG_CHECK_MODULES([ QTACCESSIBILITY] , [ Qt5AccessibilitySupport] , [ QT_LIBS="-lQt5AccessibilitySupport $QT_LIBS"] )
311- PKG_CHECK_MODULES([ QTFB] , [ Qt5FbSupport] , [ QT_LIBS="-lQt5FbSupport $QT_LIBS"] )
312- fi
313- if test "x$TARGET_OS" = xlinux; then
314- PKG_CHECK_MODULES([ QTXCBQPA] , [ Qt5XcbQpa] , [ QT_LIBS="$QTXCBQPA_LIBS $QT_LIBS"] )
315- elif test "x$TARGET_OS" = xdarwin; then
316- PKG_CHECK_MODULES([ QTCLIPBOARD] , [ Qt5ClipboardSupport] , [ QT_LIBS="-lQt5ClipboardSupport $QT_LIBS"] )
317- PKG_CHECK_MODULES([ QTGRAPHICS] , [ Qt5GraphicsSupport] , [ QT_LIBS="-lQt5GraphicsSupport $QT_LIBS"] )
318- PKG_CHECK_MODULES([ QTCGL] , [ Qt5CglSupport] , [ QT_LIBS="-lQt5CglSupport $QT_LIBS"] )
319- fi
320- ] )
321- fi
302+ m4_ifdef ( [ PKG_CHECK_MODULES] ,[
303+ if test x$bitcoin_cv_qt58 = xno; then
304+ PKG_CHECK_MODULES([ QTPLATFORM] , [ Qt5PlatformSupport] , [ QT_LIBS="$QTPLATFORM_LIBS $QT_LIBS"] )
305+ else
306+ PKG_CHECK_MODULES([ QTFONTDATABASE] , [ Qt5FontDatabaseSupport] , [ QT_LIBS="-lQt5FontDatabaseSupport $QT_LIBS"] )
307+ PKG_CHECK_MODULES([ QTEVENTDISPATCHER] , [ Qt5EventDispatcherSupport] , [ QT_LIBS="-lQt5EventDispatcherSupport $QT_LIBS"] )
308+ PKG_CHECK_MODULES([ QTTHEME] , [ Qt5ThemeSupport] , [ QT_LIBS="-lQt5ThemeSupport $QT_LIBS"] )
309+ PKG_CHECK_MODULES([ QTDEVICEDISCOVERY] , [ Qt5DeviceDiscoverySupport] , [ QT_LIBS="-lQt5DeviceDiscoverySupport $QT_LIBS"] )
310+ PKG_CHECK_MODULES([ QTACCESSIBILITY] , [ Qt5AccessibilitySupport] , [ QT_LIBS="-lQt5AccessibilitySupport $QT_LIBS"] )
311+ PKG_CHECK_MODULES([ QTFB] , [ Qt5FbSupport] , [ QT_LIBS="-lQt5FbSupport $QT_LIBS"] )
312+ fi
313+ if test "x$TARGET_OS" = xlinux; then
314+ PKG_CHECK_MODULES([ QTXCBQPA] , [ Qt5XcbQpa] , [ QT_LIBS="$QTXCBQPA_LIBS $QT_LIBS"] )
315+ elif test "x$TARGET_OS" = xdarwin; then
316+ PKG_CHECK_MODULES([ QTCLIPBOARD] , [ Qt5ClipboardSupport] , [ QT_LIBS="-lQt5ClipboardSupport $QT_LIBS"] )
317+ PKG_CHECK_MODULES([ QTGRAPHICS] , [ Qt5GraphicsSupport] , [ QT_LIBS="-lQt5GraphicsSupport $QT_LIBS"] )
318+ PKG_CHECK_MODULES([ QTCGL] , [ Qt5CglSupport] , [ QT_LIBS="-lQt5CglSupport $QT_LIBS"] )
319+ fi
320+ ] )
321+ fi
322322] )
323323
324324dnl Internal. Find Qt libraries using pkg-config.
0 commit comments