From c804e42ddf51e92e729d14664bb0b7efbae68943 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 10 Mar 2021 07:58:28 +0800 Subject: [PATCH] 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 --- build-aux/m4/bitcoin_qt.m4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index 45594463b1..81b0c74032 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -321,7 +321,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 Q_IMPORT_PLUGIN($1)]])], + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #include + 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"