Skip to content

Commit ebb4da9

Browse files
FuzzbawlsFuzzbawls
committed
build: fix m4 escaping
1 parent 2b3b9c3 commit ebb4da9

File tree

1 file changed

+18
-19
lines changed

1 file changed

+18
-19
lines changed

‎build-aux/m4/bitcoin_qt.m4‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
147147
148148
if test "x$use_hardening" != xno; then
149149
BITCOIN_QT_CHECK([
150-
AC_MSG_CHECKING(whether -fPIE can be used with this Qt config)
150+
AC_MSG_CHECKING([whether -fPIE can be used with this Qt config])
151151
TEMP_CPPFLAGS=$CPPFLAGS
152152
TEMP_CXXFLAGS=$CXXFLAGS
153153
CPPFLAGS="$QT_INCLUDES $CPPFLAGS"
@@ -171,7 +171,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
171171
])
172172
else
173173
BITCOIN_QT_CHECK([
174-
AC_MSG_CHECKING(whether -fPIC is needed with this Qt config)
174+
AC_MSG_CHECKING([whether -fPIC is needed with this Qt config])
175175
TEMP_CPPFLAGS=$CPPFLAGS
176176
CPPFLAGS="$QT_INCLUDES $CPPFLAGS"
177177
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@@ -204,17 +204,17 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
204204
BITCOIN_QT_CHECK([
205205
MOC_DEFS="${MOC_DEFS} -DQ_OS_MAC"
206206
base_frameworks="-framework Foundation -framework ApplicationServices -framework AppKit"
207-
AX_CHECK_LINK_FLAG([[$base_frameworks]],[QT_LIBS="$QT_LIBS $base_frameworks"],[AC_MSG_ERROR(could not find base frameworks)])
207+
AX_CHECK_LINK_FLAG([[$base_frameworks]],[QT_LIBS="$QT_LIBS $base_frameworks"],[AC_MSG_ERROR([could not find base frameworks])])
208208
])
209209
;;
210210
*mingw*)
211211
BITCOIN_QT_CHECK([
212-
AX_CHECK_LINK_FLAG([[-mwindows]],[QT_LDFLAGS="$QT_LDFLAGS -mwindows"],[AC_MSG_WARN(-mwindows linker support not detected)])
212+
AX_CHECK_LINK_FLAG([[-mwindows]],[QT_LDFLAGS="$QT_LDFLAGS -mwindows"],[AC_MSG_WARN([-mwindows linker support not detected])])
213213
])
214214
esac
215215
216216
dnl enable Qt support
217-
AC_MSG_CHECKING(whether to build ]AC_PACKAGE_NAME[ GUI)
217+
AC_MSG_CHECKING([whether to build ]AC_PACKAGE_NAME[ GUI])
218218
BITCOIN_QT_CHECK([
219219
bitcoin_enable_qt=yes
220220
bitcoin_enable_qt_test=yes
@@ -293,7 +293,7 @@ dnl Requires: Qt5.
293293
dnl Requires: INCLUDES and LIBS must be populated as necessary.
294294
dnl Output: bitcoin_cv_static_qt=yes|no
295295
AC_DEFUN([_BITCOIN_QT_IS_STATIC],[
296-
AC_CACHE_CHECK(for static Qt, bitcoin_cv_static_qt,[
296+
AC_CACHE_CHECK([for static Qt], bitcoin_cv_static_qt,[
297297
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
298298
#include <QtCore/qconfig.h>
299299
#ifndef QT_VERSION OR QT_VERSION_STR
@@ -316,16 +316,16 @@ dnl Inputs: $1: A series of Q_IMPORT_PLUGIN().
316316
dnl Inputs: $2: The libraries that resolve $1.
317317
dnl Output: QT_LIBS is prepended or configure exits.
318318
AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_PLUGINS],[
319-
AC_MSG_CHECKING(for static Qt plugins: $2)
319+
AC_MSG_CHECKING([for static Qt plugins: ]$2)
320320
CHECK_STATIC_PLUGINS_TEMP_LIBS="$LIBS"
321321
LIBS="$2 $QT_LIBS $LIBS"
322322
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
323323
#define QT_STATICPLUGIN
324324
#include <QtPlugin>
325325
$1]],
326326
[[return 0;]])],
327-
[AC_MSG_RESULT(yes); QT_LIBS="$2 $QT_LIBS"],
328-
[AC_MSG_RESULT(no); BITCOIN_QT_FAIL(Could not resolve: $2)])
327+
[AC_MSG_RESULT([yes]); QT_LIBS="$2 $QT_LIBS"],
328+
[AC_MSG_RESULT([no]); BITCOIN_QT_FAIL([Could not resolve: ]$2)])
329329
LIBS="$CHECK_STATIC_PLUGINS_TEMP_LIBS"
330330
])
331331

@@ -413,13 +413,13 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITH_PKGCONFIG],[
413413
fi
414414
])
415415
BITCOIN_QT_CHECK([
416-
AC_CACHE_CHECK(for Qt >= 5.5.1,bitcoin_cv_qt_minimumrequired,
417-
PKG_CHECK_EXISTS(Qt5Core < 5.5.1,[bitcoin_cv_qt_minimumrequired=no],[bitcoin_cv_qt_minimumrequired=yes])
416+
AC_CACHE_CHECK([for Qt >= 5.5.1], bitcoin_cv_qt_minimumrequired,
417+
PKG_CHECK_EXISTS(Qt5Core < 5.5.1, [bitcoin_cv_qt_minimumrequired=no], [bitcoin_cv_qt_minimumrequired=yes])
418418
)
419419
])
420420
BITCOIN_QT_CHECK([
421-
AC_CACHE_CHECK(for Qt >= 5.8.0,bitcoin_cv_qt58,
422-
PKG_CHECK_EXISTS(Qt5Core < 5.8.0,[bitcoin_cv_qt58=no],[bitcoin_cv_qt58=yes])
421+
AC_CACHE_CHECK([for Qt >= 5.8.0], bitcoin_cv_qt58,
422+
PKG_CHECK_EXISTS(Qt5Core < 5.8.0, [bitcoin_cv_qt58=no], [bitcoin_cv_qt58=yes])
423423
)
424424
])
425425
])
@@ -445,10 +445,10 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
445445
fi
446446
])
447447
448-
BITCOIN_QT_CHECK([AC_CHECK_HEADER([QtPlugin],,BITCOIN_QT_FAIL(QtCore headers missing))])
449-
BITCOIN_QT_CHECK([AC_CHECK_HEADER([QApplication],, BITCOIN_QT_FAIL(QtGui headers missing))])
450-
BITCOIN_QT_CHECK([AC_CHECK_HEADER([QLocalSocket],, BITCOIN_QT_FAIL(QtNetwork headers missing))])
451-
BITCOIN_QT_CHECK([AC_CHECK_HEADER([QtConcurrent],, BITCOIN_QT_FAIL(QtConcurrent headers missing))])
448+
BITCOIN_QT_CHECK([AC_CHECK_HEADER([QtPlugin],,BITCOIN_QT_FAIL([QtCore headers missing]))])
449+
BITCOIN_QT_CHECK([AC_CHECK_HEADER([QApplication],, BITCOIN_QT_FAIL([QtGui headers missing]))])
450+
BITCOIN_QT_CHECK([AC_CHECK_HEADER([QLocalSocket],, BITCOIN_QT_FAIL([QtNetwork headers missing]))])
451+
BITCOIN_QT_CHECK([AC_CHECK_HEADER([QtConcurrent],, BITCOIN_QT_FAIL([QtConcurrent headers missing]))])
452452
453453
BITCOIN_QT_CHECK([
454454
if test "x$bitcoin_qt_want_version" = xauto; then
@@ -465,7 +465,7 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
465465
fi
466466
467467
if test "x$TARGET_OS" = xwindows; then
468-
AC_CHECK_LIB([imm32], [main],, BITCOIN_QT_FAIL(libimm32 not found))
468+
AC_CHECK_LIB([imm32], [main],, BITCOIN_QT_FAIL([libimm32 not found]))
469469
fi
470470
])
471471
@@ -517,4 +517,3 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
517517
CXXFLAGS="$TEMP_CXXFLAGS"
518518
LIBS="$TEMP_LIBS"
519519
])
520-

0 commit comments

Comments
 (0)