Skip to content

Commit 05923e7

Browse files
committed
build: AC_PATH_PROG(S) consistently quote arguments
1 parent 407f3a4 commit 05923e7

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

build-aux/m4/bitcoin_qt.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ dnl Output: $1 is set to the path of $2 if found. $2 are searched in order.
3636
AC_DEFUN([BITCOIN_QT_PATH_PROGS],[
3737
BITCOIN_QT_CHECK([
3838
if test "x$3" != x; then
39-
AC_PATH_PROGS($1,$2,,$3)
39+
AC_PATH_PROGS([$1], [$2], [], [$3])
4040
else
41-
AC_PATH_PROGS($1,$2)
41+
AC_PATH_PROGS([$1], [$2])
4242
fi
4343
if test "x$$1" = x && test "x$4" != xyes; then
4444
BITCOIN_QT_FAIL([$1 not found])

configure.ac

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,16 @@ AC_PATH_TOOL(RANLIB, ranlib)
105105
AC_PATH_TOOL(STRIP, strip)
106106
AC_PATH_TOOL(GCOV, gcov)
107107
AC_PATH_TOOL(LLVM_COV, llvm-cov)
108-
AC_PATH_PROG(LCOV, lcov)
108+
AC_PATH_PROG([LCOV], [lcov])
109109
dnl Python 3.6 is specified in .python-version and should be used if available, see doc/dependencies.md
110110
AC_PATH_PROGS([PYTHON], [python3.6 python3.7 python3.8 python3.9 python3.10 python3.11 python3 python])
111-
AC_PATH_PROG(GENHTML, genhtml)
111+
AC_PATH_PROG([GENHTML], [genhtml])
112112
AC_PATH_PROG([GIT], [git])
113-
AC_PATH_PROG(CCACHE,ccache)
114-
AC_PATH_PROG(XGETTEXT,xgettext)
115-
AC_PATH_PROG(HEXDUMP,hexdump)
113+
AC_PATH_PROG([CCACHE], [ccache])
114+
AC_PATH_PROG([XGETTEXT], [xgettext])
115+
AC_PATH_PROG([HEXDUMP], [hexdump])
116116
AC_PATH_TOOL(OBJCOPY, objcopy)
117-
AC_PATH_PROG(DOXYGEN, doxygen)
117+
AC_PATH_PROG([DOXYGEN], [doxygen])
118118
AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
119119

120120
AC_ARG_VAR(PYTHONPATH, Augments the default search path for python module files)
@@ -647,7 +647,7 @@ case $host in
647647
dnl In libtool-speak, it's -all-static.
648648
AX_CHECK_LINK_FLAG([-static], [LIBTOOL_APP_LDFLAGS="$LIBTOOL_APP_LDFLAGS -all-static"])
649649

650-
AC_PATH_PROG([MAKENSIS], [makensis], none)
650+
AC_PATH_PROG([MAKENSIS], [makensis], [none])
651651
if test x$MAKENSIS = xnone; then
652652
AC_MSG_WARN("makensis not found. Cannot create installer.")
653653
fi
@@ -674,7 +674,7 @@ case $host in
674674
TARGET_OS=darwin
675675
if test x$cross_compiling != xyes; then
676676
BUILD_OS=darwin
677-
AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert)
677+
AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg], [rsvg-convert])
678678
AC_CHECK_PROG([BREW],brew, brew)
679679
if test x$BREW = xbrew; then
680680
dnl These Homebrew packages may be keg-only, meaning that they won't be found
@@ -734,11 +734,11 @@ case $host in
734734
AC_PATH_TOOL([DSYMUTIL], [dsymutil], dsymutil)
735735
AC_PATH_TOOL([INSTALLNAMETOOL], [install_name_tool], install_name_tool)
736736
AC_PATH_TOOL([OTOOL], [otool], otool)
737-
AC_PATH_PROGS([XORRISOFS], [xorrisofs], xorrisofs)
738-
AC_PATH_PROGS([DMG], [dmg], dmg)
739-
AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert)
740-
AC_PATH_PROGS([IMAGEMAGICK_CONVERT], [convert],convert)
741-
AC_PATH_PROGS([TIFFCP], [tiffcp],tiffcp)
737+
AC_PATH_PROGS([XORRISOFS], [xorrisofs], [xorrisofs])
738+
AC_PATH_PROGS([DMG], [dmg], [dmg])
739+
AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg], [rsvg-convert])
740+
AC_PATH_PROGS([IMAGEMAGICK_CONVERT], [convert], [convert])
741+
AC_PATH_PROGS([TIFFCP], [tiffcp], [tiffcp])
742742

743743
dnl libtool will try to strip the static lib, which is a problem for
744744
dnl cross-builds because strip attempts to call a hard-coded ld,

0 commit comments

Comments
 (0)