@@ -1379,52 +1379,52 @@ if test "x$use_natpmp" != xno; then
1379
1379
fi
1380
1380
1381
1381
if test x$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnonononononono; then
1382
- use_boost=no
1382
+ use_boost=no
1383
1383
else
1384
- use_boost=yes
1384
+ use_boost=yes
1385
1385
fi
1386
1386
1387
1387
if test x$use_boost = xyes; then
1388
1388
1389
- dnl Check for Boost headers
1390
- AX_BOOST_BASE ( [ 1.58.0] ,[ ] ,[ AC_MSG_ERROR ( [ Boost is not available!] ) ] )
1391
- if test x$want_boost = xno; then
1389
+ dnl Check for Boost headers
1390
+ AX_BOOST_BASE ( [ 1.58.0] ,[ ] ,[ AC_MSG_ERROR ( [ Boost is not available!] ) ] )
1391
+ if test x$want_boost = xno; then
1392
1392
AC_MSG_ERROR ( [ [ only libbitcoinconsensus can be built without boost] ] )
1393
- fi
1394
- AX_BOOST_SYSTEM
1395
- AX_BOOST_FILESYSTEM
1396
-
1397
- dnl Opt-in to Boost Process if external signer support is requested
1398
- if test "x$use_external_signer" != xno; then
1399
- AC_MSG_CHECKING ( for Boost Process )
1400
- AC_COMPILE_IFELSE ( [ AC_LANG_PROGRAM ( [ [ #include <boost/process.hpp>] ] ,
1401
- [ [ boost::process::child* child = new boost::process::child; delete child; ] ] ) ] ,
1402
- [ AC_MSG_RESULT ( yes )
1403
- AC_DEFINE ( [ ENABLE_EXTERNAL_SIGNER] ,,[ define if external signer support is enabled] )
1404
- ] ,
1405
- [ AC_MSG_ERROR ( [ Boost::Process is required for external signer support, but not available!] ) ]
1406
- )
1407
- fi
1393
+ fi
1394
+ AX_BOOST_SYSTEM
1395
+ AX_BOOST_FILESYSTEM
1396
+
1397
+ dnl Opt-in to Boost Process if external signer support is requested
1398
+ if test "x$use_external_signer" != xno; then
1399
+ AC_MSG_CHECKING ( for Boost Process )
1400
+ AC_COMPILE_IFELSE ( [ AC_LANG_PROGRAM ( [ [ #include <boost/process.hpp>] ] ,
1401
+ [ [ boost::process::child* child = new boost::process::child; delete child; ] ] ) ] ,
1402
+ [ AC_MSG_RESULT ( yes )
1403
+ AC_DEFINE ( [ ENABLE_EXTERNAL_SIGNER] ,,[ define if external signer support is enabled] )
1404
+ ] ,
1405
+ [ AC_MSG_ERROR ( [ Boost::Process is required for external signer support, but not available!] ) ]
1406
+ )
1407
+ fi
1408
1408
1409
- AM_CONDITIONAL([ ENABLE_EXTERNAL_SIGNER] , [ test "x$use_external_signer" = "xyes"] )
1409
+ AM_CONDITIONAL([ ENABLE_EXTERNAL_SIGNER] , [ test "x$use_external_signer" = "xyes"] )
1410
1410
1411
- if test x$suppress_external_warnings != xno; then
1411
+ if test x$suppress_external_warnings != xno; then
1412
1412
BOOST_CPPFLAGS=SUPPRESS_WARNINGS($BOOST_CPPFLAGS)
1413
- fi
1413
+ fi
1414
1414
1415
- dnl Boost 1.56 through 1.62 allow using std::atomic instead of its own atomic
1416
- dnl counter implementations. In 1.63 and later the std::atomic approach is default.
1417
- m4_pattern_allow ( DBOOST_AC_USE_STD_ATOMIC ) dnl otherwise it's treated like a macro
1418
- BOOST_CPPFLAGS="-DBOOST_SP_USE_STD_ATOMIC -DBOOST_AC_USE_STD_ATOMIC $BOOST_CPPFLAGS"
1415
+ dnl Boost 1.56 through 1.62 allow using std::atomic instead of its own atomic
1416
+ dnl counter implementations. In 1.63 and later the std::atomic approach is default.
1417
+ m4_pattern_allow ( DBOOST_AC_USE_STD_ATOMIC ) dnl otherwise it's treated like a macro
1418
+ BOOST_CPPFLAGS="-DBOOST_SP_USE_STD_ATOMIC -DBOOST_AC_USE_STD_ATOMIC $BOOST_CPPFLAGS"
1419
1419
1420
- BOOST_LIBS="$BOOST_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB"
1420
+ BOOST_LIBS="$BOOST_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB"
1421
1421
fi
1422
1422
1423
1423
dnl Check for reduced exports
1424
1424
if test x$use_reduce_exports = xyes; then
1425
- AX_CHECK_COMPILE_FLAG ( [ -fvisibility=hidden] ,[ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"] ,
1426
- [ AC_MSG_ERROR ( [ Cannot set hidden symbol visibility. Use --disable-reduce-exports.] ) ] ,[ [ $CXXFLAG_WERROR] ] )
1427
- AX_CHECK_LINK_FLAG ( [ [ -Wl,--exclude-libs,ALL] ] ,[ RELDFLAGS="-Wl,--exclude-libs,ALL"] ,,[ [ $LDFLAG_WERROR] ] )
1425
+ AX_CHECK_COMPILE_FLAG ( [ -fvisibility=hidden] ,[ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"] ,
1426
+ [ AC_MSG_ERROR ( [ Cannot set hidden symbol visibility. Use --disable-reduce-exports.] ) ] ,[ [ $CXXFLAG_WERROR] ] )
1427
+ AX_CHECK_LINK_FLAG ( [ [ -Wl,--exclude-libs,ALL] ] ,[ RELDFLAGS="-Wl,--exclude-libs,ALL"] ,,[ [ $LDFLAG_WERROR] ] )
1428
1428
fi
1429
1429
1430
1430
if test x$use_tests = xyes; then
@@ -1435,25 +1435,25 @@ if test x$use_tests = xyes; then
1435
1435
1436
1436
if test x$use_boost = xyes; then
1437
1437
1438
- AX_BOOST_UNIT_TEST_FRAMEWORK
1439
-
1440
- dnl Determine if -DBOOST_TEST_DYN_LINK is needed
1441
- AC_MSG_CHECKING ( [ for dynamic linked boost test] )
1442
- TEMP_LIBS="$LIBS"
1443
- LIBS="$LIBS $BOOST_LDFLAGS $BOOST_UNIT_TEST_FRAMEWORK_LIB"
1444
- TEMP_CPPFLAGS="$CPPFLAGS"
1445
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
1446
- AC_LINK_IFELSE ( [ AC_LANG_SOURCE ( [
1447
- #define BOOST_TEST_DYN_LINK
1448
- #define BOOST_TEST_MAIN
1449
- #include <boost/test/unit_test.hpp>
1450
-
1451
- ] ) ] ,
1452
- [ AC_MSG_RESULT ( yes ) ]
1453
- [ TESTDEFS="$TESTDEFS -DBOOST_TEST_DYN_LINK"] ,
1454
- [ AC_MSG_RESULT ( no ) ] )
1455
- LIBS="$TEMP_LIBS"
1456
- CPPFLAGS="$TEMP_CPPFLAGS"
1438
+ AX_BOOST_UNIT_TEST_FRAMEWORK
1439
+
1440
+ dnl Determine if -DBOOST_TEST_DYN_LINK is needed
1441
+ AC_MSG_CHECKING ( [ for dynamic linked boost test] )
1442
+ TEMP_LIBS="$LIBS"
1443
+ LIBS="$LIBS $BOOST_LDFLAGS $BOOST_UNIT_TEST_FRAMEWORK_LIB"
1444
+ TEMP_CPPFLAGS="$CPPFLAGS"
1445
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
1446
+ AC_LINK_IFELSE ( [ AC_LANG_SOURCE ( [
1447
+ #define BOOST_TEST_DYN_LINK
1448
+ #define BOOST_TEST_MAIN
1449
+ #include <boost/test/unit_test.hpp>
1450
+
1451
+ ] ) ] ,
1452
+ [ AC_MSG_RESULT ( yes ) ]
1453
+ [ TESTDEFS="$TESTDEFS -DBOOST_TEST_DYN_LINK"] ,
1454
+ [ AC_MSG_RESULT ( no ) ] )
1455
+ LIBS="$TEMP_LIBS"
1456
+ CPPFLAGS="$TEMP_CPPFLAGS"
1457
1457
1458
1458
fi
1459
1459
fi
0 commit comments