@@ -108,11 +108,10 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
108
108
BITCOIN_QT_CHECK([ _BITCOIN_QT_FIND_LIBS] )
109
109
110
110
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.
116
115
BITCOIN_QT_CHECK([
117
116
TEMP_CPPFLAGS=$CPPFLAGS
118
117
TEMP_CXXFLAGS=$CXXFLAGS
@@ -282,12 +281,13 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
282
281
AC_SUBST ( MOC_DEFS )
283
282
] )
284
283
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.
288
285
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
291
291
dnl Requires: INCLUDES and LIBS must be populated as necessary.
292
292
dnl Output: bitcoin_cv_static_qt=yes|no
293
293
AC_DEFUN ( [ _BITCOIN_QT_IS_STATIC] ,[
335
335
dnl _BITCOIN_QT_CHECK_STATIC_LIBS
336
336
dnl -----------------------------
337
337
dnl
338
- dnl Inputs: no inputs.
339
338
dnl Outputs: QT_LIBS is prepended.
340
339
AC_DEFUN ( [ _BITCOIN_QT_CHECK_STATIC_LIBS] , [
341
340
PKG_CHECK_MODULES([ QT_ACCESSIBILITY] , [ ${qt_lib_prefix}AccessibilitySupport${qt_lib_suffix}] , [ QT_LIBS="$QT_ACCESSIBILITY_LIBS $QT_LIBS"] )
@@ -357,6 +356,10 @@ AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_LIBS], [
357
356
] )
358
357
359
358
dnl Internal. Find Qt libraries using pkg-config.
359
+ dnl
360
+ dnl _BITCOIN_QT_FIND_LIBS
361
+ dnl ---------------------
362
+ dnl
360
363
dnl Outputs: All necessary QT_* variables are set.
361
364
dnl Outputs: have_qt_test and have_qt_dbus are set (if applicable) to yes|no.
362
365
AC_DEFUN ( [ _BITCOIN_QT_FIND_LIBS] ,[
0 commit comments