@@ -108,11 +108,10 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
108108 BITCOIN_QT_CHECK([ _BITCOIN_QT_FIND_LIBS]
109109
110110 dnl This is ugly and complicated. Yuck. Works as follows:
111- dnl For Qt5, we can check a header to find out whether Qt is build
112- dnl statically. When Qt is built statically, some plugins must be linked into
113- dnl the final binary as well.
114- dnl _BITCOIN_QT_CHECK_STATIC_PLUGIN does a quick link-check and appends the
115- dnl results to QT_LIBS.
111+ dnl We check a header to find out whether Qt is built statically.
112+ dnl When Qt is built statically, some plugins must be linked into
113+ dnl the final binary as well. _BITCOIN_QT_CHECK_STATIC_PLUGIN does
114+ dnl a quick link-check and appends the results to QT_LIBS.
116115 BITCOIN_QT_CHECK([
117116 TEMP_CPPFLAGS=$CPPFLAGS
118117 TEMP_CXXFLAGS=$CXXFLAGS
@@ -162,7 +161,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
162161 _BITCOIN_QT_CHECK_STATIC_PLUGIN([ QMacStylePlugin] [ -lqmacstyle]
163162 AC_DEFINE ( QT_QPA_PLATFORM_COCOA , 1 , [ Define this symbol if the qt platform is cocoa] )
164163 elif test "x$TARGET_OS" = xandroid; then
165- QT_LIBS="-Wl,--export-dynamic,--undefined=JNI_OnLoad -lqtforandroid -ljnigraphics -landroid -lqtfreetype -lQt5EglSupport $QT_LIBS"
164+ QT_LIBS="-Wl,--export-dynamic,--undefined=JNI_OnLoad -lqtforandroid -ljnigraphics -landroid -lqtfreetype $QT_LIBS"
166165 AC_DEFINE ( QT_QPA_PLATFORM_ANDROID , 1 , [ Define this symbol if the qt platform is android] )
167166 fi
168167 fi
@@ -171,7 +170,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
171170 ] )
172171
173172 if test "x$qt_bin_path" = x; then
174- qt_bin_path="`$PKG_CONFIG --variable=host_bins Qt5Core 2>/dev/null`"
173+ qt_bin_path="`$PKG_CONFIG --variable=host_bins ${qt_lib_prefix}Core 2>/dev/null`"
175174 fi
176175
177176 if test "x$use_hardening" != xno; then
@@ -282,12 +281,13 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
282281 AC_SUBST ( MOC_DEFS )
283282] )
284283
285- dnl All macros below are internal and should _not_ be used from the main
286- dnl configure.ac.
287- dnl ----
284+ dnl All macros below are internal and should _not_ be used from configure.ac.
288285
289- dnl Internal. Check if the linked version of Qt was built as static libs.
290- dnl Requires: Qt5.
286+ dnl Internal. Check if the linked version of Qt was built statically.
287+ dnl
288+ dnl _BITCOIN_QT_IS_STATIC
289+ dnl ---------------------
290+ dnl
291291dnl Requires: INCLUDES and LIBS must be populated as necessary.
292292dnl Output: bitcoin_cv_static_qt=yes|no
293293AC_DEFUN ( [ _BITCOIN_QT_IS_STATIC] [
@@ -335,47 +335,54 @@ dnl
335335dnl _BITCOIN_QT_CHECK_STATIC_LIBS
336336dnl -----------------------------
337337dnl
338- dnl Inputs: no inputs.
339338dnl Outputs: QT_LIBS is prepended.
340339AC_DEFUN ( [ _BITCOIN_QT_CHECK_STATIC_LIBS] [
341- PKG_CHECK_MODULES([ QTFONTDATABASE] [ Qt5FontDatabaseSupport${qt_lib_suffix}] [ QT_LIBS="-lQt5FontDatabaseSupport${qt_lib_suffix} $QT_LIBS"]
342- PKG_CHECK_MODULES([ QTEVENTDISPATCHER] [ Qt5EventDispatcherSupport${qt_lib_suffix}] [ QT_LIBS="-lQt5EventDispatcherSupport${qt_lib_suffix} $QT_LIBS"]
343- PKG_CHECK_MODULES([ QTTHEME] [ Qt5ThemeSupport${qt_lib_suffix}] [ QT_LIBS="-lQt5ThemeSupport${qt_lib_suffix} $QT_LIBS"]
344- PKG_CHECK_MODULES([ QTDEVICEDISCOVERY] [ Qt5DeviceDiscoverySupport${qt_lib_suffix}] [ QT_LIBS="-lQt5DeviceDiscoverySupport${qt_lib_suffix} $QT_LIBS"]
345- PKG_CHECK_MODULES([ QTACCESSIBILITY] [ Qt5AccessibilitySupport${qt_lib_suffix}] [ QT_LIBS="-lQt5AccessibilitySupport${qt_lib_suffix} $QT_LIBS"]
346- PKG_CHECK_MODULES([ QTFB] [ Qt5FbSupport${qt_lib_suffix}] [ QT_LIBS="-lQt5FbSupport${qt_lib_suffix} $QT_LIBS"]
340+ PKG_CHECK_MODULES([ QT_ACCESSIBILITY] [ ${qt_lib_prefix}AccessibilitySupport${qt_lib_suffix}] [ QT_LIBS="$QT_ACCESSIBILITY_LIBS $QT_LIBS"]
341+ PKG_CHECK_MODULES([ QT_DEVICEDISCOVERY] [ ${qt_lib_prefix}DeviceDiscoverySupport${qt_lib_suffix}] [ QT_LIBS="$QT_DEVICEDISCOVERY_LIBS $QT_LIBS"]
342+ PKG_CHECK_MODULES([ QT_EDID] [ ${qt_lib_prefix}EdidSupport${qt_lib_suffix}] [ QT_LIBS="$QT_EDID_LIBS $QT_LIBS"]
343+ PKG_CHECK_MODULES([ QT_EVENTDISPATCHER] [ ${qt_lib_prefix}EventDispatcherSupport${qt_lib_suffix}] [ QT_LIBS="$QT_EVENTDISPATCHER_LIBS $QT_LIBS"]
344+ PKG_CHECK_MODULES([ QT_FB] [ ${qt_lib_prefix}FbSupport${qt_lib_suffix}] [ QT_LIBS="$QT_FB_LIBS $QT_LIBS"]
345+ PKG_CHECK_MODULES([ QT_FONTDATABASE] [ ${qt_lib_prefix}FontDatabaseSupport${qt_lib_suffix}] [ QT_LIBS="$QT_FONTDATABASE_LIBS $QT_LIBS"]
346+ PKG_CHECK_MODULES([ QT_THEME] [ ${qt_lib_prefix}ThemeSupport${qt_lib_suffix}] [ QT_LIBS="$QT_THEME_LIBS $QT_LIBS"]
347347 if test "x$TARGET_OS" = xlinux; then
348- PKG_CHECK_MODULES([ QTXCBQPA] [ Qt5XcbQpa] [ QT_LIBS="$QTXCBQPA_LIBS $QT_LIBS"]
348+ PKG_CHECK_MODULES([ QT_INPUT] [ ${qt_lib_prefix}XcbQpa] [ QT_LIBS="$QT_INPUT_LIBS $QT_LIBS"]
349+ PKG_CHECK_MODULES([ QT_SERVICE] [ ${qt_lib_prefix}ServiceSupport] [ QT_LIBS="$QT_SERVICE_LIBS $QT_LIBS"]
350+ PKG_CHECK_MODULES([ QT_XCBQPA] [ ${qt_lib_prefix}XcbQpa] [ QT_LIBS="$QT_XCBQPA_LIBS $QT_LIBS"]
349351 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"]
352+ PKG_CHECK_MODULES([ QT_CLIPBOARD] [ ${qt_lib_prefix}ClipboardSupport${qt_lib_suffix}] [ QT_LIBS="$QT_CLIPBOARD_LIBS $QT_LIBS"]
353+ PKG_CHECK_MODULES([ QT_GRAPHICS] [ ${qt_lib_prefix}GraphicsSupport${qt_lib_suffix}] [ QT_LIBS="$QT_GRAPHICS_LIBS $QT_LIBS"]
354+ PKG_CHECK_MODULES([ QT_SERVICE] [ ${qt_lib_prefix}ServiceSupport${qt_lib_suffix}] [ QT_LIBS="$QT_SERVICE_LIBS $QT_LIBS"]
352355 elif test "x$TARGET_OS" = xwindows; then
353- PKG_CHECK_MODULES([ QTWINDOWSUIAUTOMATION] [ Qt5WindowsUIAutomationSupport${qt_lib_suffix}] [ QT_LIBS="-lQt5WindowsUIAutomationSupport${qt_lib_suffix} $QT_LIBS"]
356+ PKG_CHECK_MODULES([ QT_WINDOWSUIAUTOMATION] [ ${qt_lib_prefix}WindowsUIAutomationSupport${qt_lib_suffix}] [ QT_LIBS="$QT_WINDOWSUIAUTOMATION_LIBS $QT_LIBS"]
357+ elif test "x$TARGET_OS" = xandroid; then
358+ PKG_CHECK_MODULES([ QT_EGL] [ ${qt_lib_prefix}EglSupport] [ QT_LIBS="$QT_EGL_LIBS $QT_LIBS"]
354359 fi
355360] )
356361
357362dnl Internal. Find Qt libraries using pkg-config.
363+ dnl
364+ dnl _BITCOIN_QT_FIND_LIBS
365+ dnl ---------------------
366+ dnl
358367dnl Outputs: All necessary QT_* variables are set.
359368dnl Outputs: have_qt_test and have_qt_dbus are set (if applicable) to yes|no.
360369AC_DEFUN ( [ _BITCOIN_QT_FIND_LIBS] [
361370 BITCOIN_QT_CHECK([
362- PKG_CHECK_MODULES([ QT_CORE] [ ${qt_lib_prefix}Core${qt_lib_suffix} $qt_version] [ ]
371+ PKG_CHECK_MODULES([ QT_CORE] [ ${qt_lib_prefix}Core${qt_lib_suffix} $qt_version] [ QT_INCLUDES="$QT_CORE_CFLAGS $QT_INCLUDES" QT_LIBS="$QT_CORE_LIBS $QT_LIBS" ]
363372 [ BITCOIN_QT_FAIL([ ${qt_lib_prefix}Core${qt_lib_suffix} $qt_version not found] ]
364373 ] )
365374 BITCOIN_QT_CHECK([
366- PKG_CHECK_MODULES([ QT_GUI] [ ${qt_lib_prefix}Gui${qt_lib_suffix} $qt_version] [ ]
375+ PKG_CHECK_MODULES([ QT_GUI] [ ${qt_lib_prefix}Gui${qt_lib_suffix} $qt_version] [ QT_INCLUDES="$QT_GUI_CFLAGS $QT_INCLUDES" QT_LIBS="$QT_GUI_LIBS $QT_LIBS" ]
367376 [ BITCOIN_QT_FAIL([ ${qt_lib_prefix}Gui${qt_lib_suffix} $qt_version not found] ]
368377 ] )
369378 BITCOIN_QT_CHECK([
370- PKG_CHECK_MODULES([ QT_WIDGETS] [ ${qt_lib_prefix}Widgets${qt_lib_suffix} $qt_version] [ ]
379+ PKG_CHECK_MODULES([ QT_WIDGETS] [ ${qt_lib_prefix}Widgets${qt_lib_suffix} $qt_version] [ QT_INCLUDES="$QT_WIDGETS_CFLAGS $QT_INCLUDES" QT_LIBS="$QT_WIDGETS_LIBS $QT_LIBS" ]
371380 [ BITCOIN_QT_FAIL([ ${qt_lib_prefix}Widgets${qt_lib_suffix} $qt_version not found] ]
372381 ] )
373382 BITCOIN_QT_CHECK([
374- PKG_CHECK_MODULES([ QT_NETWORK] [ ${qt_lib_prefix}Network${qt_lib_suffix} $qt_version] [ ]
383+ PKG_CHECK_MODULES([ QT_NETWORK] [ ${qt_lib_prefix}Network${qt_lib_suffix} $qt_version] [ QT_INCLUDES="$QT_NETWORK_CFLAGS $QT_INCLUDES" QT_LIBS="$QT_NETWORK_LIBS $QT_LIBS" ]
375384 [ BITCOIN_QT_FAIL([ ${qt_lib_prefix}Network${qt_lib_suffix} $qt_version not found] ]
376385 ] )
377- QT_INCLUDES="$QT_CORE_CFLAGS $QT_GUI_CFLAGS $QT_WIDGETS_CFLAGS $QT_NETWORK_CFLAGS"
378- QT_LIBS="$QT_CORE_LIBS $QT_GUI_LIBS $QT_WIDGETS_LIBS $QT_NETWORK_LIBS"
379386
380387 BITCOIN_QT_CHECK([
381388 PKG_CHECK_MODULES([ QT_TEST] [ ${qt_lib_prefix}Test${qt_lib_suffix} $qt_version] [ QT_TEST_INCLUDES="$QT_TEST_CFLAGS"; have_qt_test=yes] [ have_qt_test=no]
0 commit comments