Bugfix: Only check for boost when building code that requires it
This commit is contained in:
parent
a19eeaced8
commit
b7a4ecc153
1 changed files with 42 additions and 22 deletions
64
configure.ac
64
configure.ac
|
@ -171,6 +171,24 @@ if test "x$CXXFLAGS_overridden" = "xno"; then
|
||||||
fi
|
fi
|
||||||
CPPFLAGS="$CPPFLAGS -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS"
|
CPPFLAGS="$CPPFLAGS -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS"
|
||||||
|
|
||||||
|
AC_ARG_WITH([utils],
|
||||||
|
[AS_HELP_STRING([--with-utils],
|
||||||
|
[build bitcoin-cli bitcoin-tx (default=yes)])],
|
||||||
|
[build_bitcoin_utils=$withval],
|
||||||
|
[build_bitcoin_utils=yes])
|
||||||
|
|
||||||
|
AC_ARG_WITH([libs],
|
||||||
|
[AS_HELP_STRING([--with-libs],
|
||||||
|
[build libraries (default=yes)])],
|
||||||
|
[build_bitcoin_libs=$withval],
|
||||||
|
[build_bitcoin_libs=yes])
|
||||||
|
|
||||||
|
AC_ARG_WITH([daemon],
|
||||||
|
[AS_HELP_STRING([--with-daemon],
|
||||||
|
[build bitcoind daemon (default=yes)])],
|
||||||
|
[build_bitcoind=$withval],
|
||||||
|
[build_bitcoind=yes])
|
||||||
|
|
||||||
AC_LANG_PUSH([C++])
|
AC_LANG_PUSH([C++])
|
||||||
|
|
||||||
use_pkgconfig=yes
|
use_pkgconfig=yes
|
||||||
|
@ -500,6 +518,19 @@ if test x$use_upnp != xno; then
|
||||||
)
|
)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
BITCOIN_QT_INIT
|
||||||
|
|
||||||
|
dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
|
||||||
|
BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4])
|
||||||
|
|
||||||
|
if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then
|
||||||
|
use_boost=no
|
||||||
|
else
|
||||||
|
use_boost=yes
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test x$use_boost = xyes; then
|
||||||
|
|
||||||
dnl Check for boost libs
|
dnl Check for boost libs
|
||||||
AX_BOOST_BASE
|
AX_BOOST_BASE
|
||||||
AX_BOOST_SYSTEM
|
AX_BOOST_SYSTEM
|
||||||
|
@ -537,6 +568,10 @@ if test x$use_reduce_exports != xno; then
|
||||||
CPPFLAGS="$TEMP_CPPFLAGS"
|
CPPFLAGS="$TEMP_CPPFLAGS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
elif test x$use_reduce_exports = xauto; then
|
||||||
|
use_reduce_exports=yes
|
||||||
|
fi
|
||||||
|
|
||||||
if test x$use_reduce_exports != xno; then
|
if test x$use_reduce_exports != xno; then
|
||||||
CXXFLAGS="$CXXFLAGS $RE_CXXFLAGS"
|
CXXFLAGS="$CXXFLAGS $RE_CXXFLAGS"
|
||||||
AX_CHECK_LINK_FLAG([[-Wl,--exclude-libs,ALL]], [RELDFLAGS="-Wl,--exclude-libs,ALL"])
|
AX_CHECK_LINK_FLAG([[-Wl,--exclude-libs,ALL]], [RELDFLAGS="-Wl,--exclude-libs,ALL"])
|
||||||
|
@ -549,6 +584,8 @@ if test x$use_tests = xyes; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
if test x$use_boost = xyes; then
|
||||||
|
|
||||||
AX_BOOST_UNIT_TEST_FRAMEWORK
|
AX_BOOST_UNIT_TEST_FRAMEWORK
|
||||||
|
|
||||||
dnl Determine if -DBOOST_TEST_DYN_LINK is needed
|
dnl Determine if -DBOOST_TEST_DYN_LINK is needed
|
||||||
|
@ -568,8 +605,12 @@ if test x$use_tests = xyes; then
|
||||||
[AC_MSG_RESULT(no)])
|
[AC_MSG_RESULT(no)])
|
||||||
LIBS="$TEMP_LIBS"
|
LIBS="$TEMP_LIBS"
|
||||||
CPPFLAGS="$TEMP_CPPFLAGS"
|
CPPFLAGS="$TEMP_CPPFLAGS"
|
||||||
|
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test x$use_boost = xyes; then
|
||||||
|
|
||||||
BOOST_LIBS="$BOOST_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB $BOOST_PROGRAM_OPTIONS_LIB $BOOST_THREAD_LIB"
|
BOOST_LIBS="$BOOST_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB $BOOST_PROGRAM_OPTIONS_LIB $BOOST_THREAD_LIB"
|
||||||
|
|
||||||
dnl Boost >= 1.50 uses sleep_for rather than the now-deprecated sleep, however
|
dnl Boost >= 1.50 uses sleep_for rather than the now-deprecated sleep, however
|
||||||
|
@ -626,25 +667,7 @@ if test x$boost_sleep != xyes; then
|
||||||
AC_MSG_ERROR(No working boost sleep implementation found.)
|
AC_MSG_ERROR(No working boost sleep implementation found.)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_ARG_WITH([utils],
|
fi
|
||||||
[AS_HELP_STRING([--with-utils],
|
|
||||||
[build bitcoin-cli bitcoin-tx (default=yes)])],
|
|
||||||
[build_bitcoin_utils=$withval],
|
|
||||||
[build_bitcoin_utils=yes])
|
|
||||||
|
|
||||||
AC_ARG_WITH([libs],
|
|
||||||
[AS_HELP_STRING([--with-libs],
|
|
||||||
[build libraries (default=yes)])],
|
|
||||||
[build_bitcoin_libs=$withval],
|
|
||||||
[build_bitcoin_libs=yes])
|
|
||||||
|
|
||||||
AC_ARG_WITH([daemon],
|
|
||||||
[AS_HELP_STRING([--with-daemon],
|
|
||||||
[build bitcoind daemon (default=yes)])],
|
|
||||||
[build_bitcoind=$withval],
|
|
||||||
[build_bitcoind=yes])
|
|
||||||
|
|
||||||
BITCOIN_QT_INIT
|
|
||||||
|
|
||||||
if test x$use_pkgconfig = xyes; then
|
if test x$use_pkgconfig = xyes; then
|
||||||
|
|
||||||
|
@ -703,9 +726,6 @@ if test x$build_bitcoin_libs = xyes; then
|
||||||
fi
|
fi
|
||||||
AC_MSG_RESULT($build_bitcoin_libs)
|
AC_MSG_RESULT($build_bitcoin_libs)
|
||||||
|
|
||||||
dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
|
|
||||||
BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4])
|
|
||||||
|
|
||||||
AC_LANG_POP
|
AC_LANG_POP
|
||||||
|
|
||||||
if test "x$use_ccache" != "xno"; then
|
if test "x$use_ccache" != "xno"; then
|
||||||
|
|
Loading…
Reference in a new issue