Skip to content

Commit 253f90c

Browse files
committed
Merge bitcoin-core/secp256k1#951: configure: replace AC_PATH_PROG to AC_CHECK_PROG
a4642fa configure: replace AC_PATH_PROG to AC_CHECK_PROG (UdjinM6) Pull request description: ACKs for top commit: real-or-random: ACK a4642fa jonasnick: utACK a4642fa Tree-SHA512: 55a431633ca45ea78be3887cda2e94f6ec9e8a937bc60cf04f14d7e3be11acb7ee861bd356070e3b1f6ccdeff28c6f9ab7048a58f920681c09fe3a976621a187
2 parents 446d28d + a4642fa commit 253f90c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

configure.ac

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ AM_PROG_AS
3838
case $host_os in
3939
*darwin*)
4040
if test x$cross_compiling != xyes; then
41-
AC_PATH_PROG([BREW],brew,)
42-
if test x$BREW != x; then
41+
AC_CHECK_PROG([BREW], brew, brew)
42+
if test x$BREW = xbrew; then
4343
# These Homebrew packages may be keg-only, meaning that they won't be found
4444
# in expected paths because they may conflict with system files. Ask
4545
# Homebrew where each one is located, then adjust paths accordingly.
@@ -54,10 +54,10 @@ case $host_os in
5454
VALGRIND_CPPFLAGS="-I$valgrind_prefix/include"
5555
fi
5656
else
57-
AC_PATH_PROG([PORT],port,)
57+
AC_CHECK_PROG([PORT], port, port)
5858
# If homebrew isn't installed and macports is, add the macports default paths
5959
# as a last resort.
60-
if test x$PORT != x; then
60+
if test x$PORT = xport; then
6161
CPPFLAGS="$CPPFLAGS -isystem /opt/local/include"
6262
LDFLAGS="$LDFLAGS -L/opt/local/lib"
6363
fi

0 commit comments

Comments
 (0)