Skip to content

Commit c5da274

Browse files
committed
build: actually stop configure if Boost isn't available
If Boost is not found via AX_BOOST_BASE, we don't actually stop configuring, only a warning is emitted: ```bash checking for boostlib >= 1.58.0 (105800)... configure: We could not detect the boost libraries (version MINIMUM_REQUIRED_BOOST or higher). If you have a staged boost library (still not installed) please specify $BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation. ``` Instead we would usually fail when one of the other AX_BOOST_* macros fails to find a library. These macros are slowly being removed, and in any case, it makes more sense to fail earlier if Boost is missing. If Boost is unavailable, the failure now looks like: ```bash checking for boostlib >= 1.58.0 (105800)... configure: We could not detect the boost libraries (version 1.58.0 or higher). If you have a staged boost library (still not installed) please specify $BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation. configure: error: Boost is not available! ``` Note that we now just pass the version into AX_BOOST_BASE, which fixes it's display in the output (rather than MINIMUM_REQUIRED_BOOST).
1 parent cad8b52 commit c5da274

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

configure.ac

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,11 +1377,8 @@ fi
13771377

13781378
if test x$use_boost = xyes; then
13791379

1380-
dnl Minimum required Boost version
1381-
define(MINIMUM_REQUIRED_BOOST, 1.58.0)
1382-
1383-
dnl Check for Boost libs
1384-
AX_BOOST_BASE([MINIMUM_REQUIRED_BOOST])
1380+
dnl Check for Boost headers
1381+
AX_BOOST_BASE([1.58.0],[],[AC_MSG_ERROR([Boost is not available!])])
13851382
if test x$want_boost = xno; then
13861383
AC_MSG_ERROR([[only libbitcoinconsensus can be built without boost]])
13871384
fi

0 commit comments

Comments
 (0)