diff options
| author | fanquake <fanquake@gmail.com> | 2021-03-10 07:58:28 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-03-10 08:03:32 +0800 |
| commit | bca5ee6f38f0ac89f0bb90d9e005b5bbd7c25b82 (patch) | |
| tree | 35f7118b9da91a1cbf56cd521a6dd200018ba22d | |
| parent | ee0dc02c6f93de2a366bbff490eb4d37bca6a24f (diff) | |
| parent | ffdd7de690d8dbe813de0108eb2a7997a8027773 (diff) | |
| download | bitcoin-bca5ee6f38f0ac89f0bb90d9e005b5bbd7c25b82.tar.xz | |
Merge #21400: build: Fix regression introduced in #21363
ffdd7de690d8dbe813de0108eb2a7997a8027773 build, qt: Fix regression introduced in #21363 (Hennadii Stepanov)
Pull request description:
After #21363 the `_BITCOIN_QT_CHECK_STATIC_PLUGIN` never fails due to the ill-formed code.
Sorry for breaking it.
ACKs for top commit:
fanquake:
ACK ffdd7de690d8dbe813de0108eb2a7997a8027773
Tree-SHA512: 0af3334af5332f3b349dba219565ee336090541c2c4fae53d7dc4dd2aa05291b3c7c13bfc506219f642fb854f3c887f0f9621b42d0df68d5d794e0563b2cf5d4
| -rw-r--r-- | build-aux/m4/bitcoin_qt.m4 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index 5b7c3948d9..67ae03f3a9 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -306,7 +306,10 @@ AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_PLUGIN], [ AC_MSG_CHECKING([for $1 ($2)]) CHECK_STATIC_PLUGINS_TEMP_LIBS="$LIBS" LIBS="$2${qt_lib_suffix} $QT_LIBS $LIBS" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <QtPlugin> Q_IMPORT_PLUGIN($1)]])], + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #include <QtPlugin> + Q_IMPORT_PLUGIN($1) + ]])], [AC_MSG_RESULT([yes]); QT_LIBS="$2${qt_lib_suffix} $QT_LIBS"], [AC_MSG_RESULT([no]); BITCOIN_QT_FAIL([$1 not found.])]) LIBS="$CHECK_STATIC_PLUGINS_TEMP_LIBS" |