Skip to content

Commit

Permalink
build: consistently quote AC_SEARCH_LIBS() arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
Fuzzbawls committed May 4, 2024
1 parent 6110f8a commit 89c7540
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions build-aux/m4/bitcoin_qt.m4
Original file line number Diff line number Diff line change
Expand Up @@ -470,15 +470,15 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
])
BITCOIN_QT_CHECK(AC_CHECK_LIB([z], [main], [], [AC_MSG_WARN([zlib not found. Assuming Qt has it built-in])]))
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([jpeg_create_decompress] ,[qtjpeg jpeg],,AC_MSG_WARN([libjpeg not found. Assuming Qt has it built-in])))
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([jpeg_create_decompress], [qtjpeg jpeg], [], [AC_MSG_WARN([libjpeg not found. Assuming Qt has it built-in])]))
if test x$bitcoin_cv_qt58 = xno; then
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([png_error] ,[qtpng png],,AC_MSG_WARN([libpng not found. Assuming Qt has it built-in])))
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([pcre16_exec], [qtpcre pcre16],,AC_MSG_WARN([libpcre16 not found. Assuming Qt has it built-in])))
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([png_error], [qtpng png], [], [AC_MSG_WARN([libpng not found. Assuming Qt has it built-in])]))
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([pcre16_exec], [qtpcre pcre16], [], [AC_MSG_WARN([libpcre16 not found. Assuming Qt has it built-in])]))
else
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([png_error] ,[qtlibpng png],,AC_MSG_WARN([libpng not found. Assuming Qt has it built-in])))
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([pcre2_match_16], [qtpcre2 libqtpcre2],,AC_MSG_WARN([libqtpcre2 not found. Assuming Qt has it built-in])))
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([png_error], [qtlibpng png], [], [AC_MSG_WARN([libpng not found. Assuming Qt has it built-in])]))
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([pcre2_match_16], [qtpcre2 libqtpcre2], [], [AC_MSG_WARN([libqtpcre2 not found. Assuming Qt has it built-in])]))
fi
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([hb_ot_tags_from_script] ,[qtharfbuzzng qtharfbuzz harfbuzz],,AC_MSG_WARN([libharfbuzz not found. Assuming Qt has it built-in or support is disabled])))
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([hb_ot_tags_from_script], [qtharfbuzzng qtharfbuzz harfbuzz], [], [AC_MSG_WARN([libharfbuzz not found. Assuming Qt has it built-in or support is disabled])]))
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Core], [main], [], [BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Core not found)]))
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Gui], [main], [], [BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Gui not found)]))
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Network], [main], [], [BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Network not found)]))
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ if test x$use_glibc_compat != xno; then
AX_CHECK_LINK_FLAG([-Wl,--wrap=__divmoddi4], [COMPAT_LDFLAGS="$COMPAT_LDFLAGS -Wl,--wrap=__divmoddi4"])
AX_CHECK_LINK_FLAG([-Wl,--wrap=log2f], [COMPAT_LDFLAGS="$COMPAT_LDFLAGS -Wl,--wrap=log2f"])
else
AC_SEARCH_LIBS([clock_gettime],[rt])
AC_SEARCH_LIBS([clock_gettime], [rt])
fi

if test "x$enable_gprof" = xyes; then
Expand Down

0 comments on commit 89c7540

Please sign in to comment.