Skip to content

Commit a53eff3

Browse files
committed
build: misc doc changes in bitcoin_qt.m4
1 parent 340fa6c commit a53eff3

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

build-aux/m4/bitcoin_qt.m4

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -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
@@ -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
291291
dnl Requires: INCLUDES and LIBS must be populated as necessary.
292292
dnl Output: bitcoin_cv_static_qt=yes|no
293293
AC_DEFUN([_BITCOIN_QT_IS_STATIC],[
@@ -335,7 +335,6 @@ dnl
335335
dnl _BITCOIN_QT_CHECK_STATIC_LIBS
336336
dnl -----------------------------
337337
dnl
338-
dnl Inputs: no inputs.
339338
dnl Outputs: QT_LIBS is prepended.
340339
AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_LIBS], [
341340
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], [
357356
])
358357

359358
dnl Internal. Find Qt libraries using pkg-config.
359+
dnl
360+
dnl _BITCOIN_QT_FIND_LIBS
361+
dnl ---------------------
362+
dnl
360363
dnl Outputs: All necessary QT_* variables are set.
361364
dnl Outputs: have_qt_test and have_qt_dbus are set (if applicable) to yes|no.
362365
AC_DEFUN([_BITCOIN_QT_FIND_LIBS],[

0 commit comments

Comments
 (0)