|
|
@ -105,11 +105,6 @@ AC_ARG_ENABLE(tests, |
|
|
|
[use_tests=$enableval], |
|
|
|
[use_tests=yes]) |
|
|
|
|
|
|
|
AC_ARG_ENABLE(gui-tests, |
|
|
|
AS_HELP_STRING([--disable-gui-tests],[do not compile GUI tests (default is to compile if GUI and tests enabled)]), |
|
|
|
[use_gui_tests=$enableval], |
|
|
|
[use_gui_tests=$use_tests]) |
|
|
|
|
|
|
|
AC_ARG_WITH([comparison-tool], |
|
|
|
AS_HELP_STRING([--with-comparison-tool],[path to java comparison tool (requires --enable-tests)]), |
|
|
|
[use_comparison_tool=$withval], |
|
|
@ -295,7 +290,7 @@ case $host in |
|
|
|
dnl in expected paths because they may conflict with system files. Ask |
|
|
|
dnl Homebrew where each one is located, then adjust paths accordingly. |
|
|
|
dnl It's safe to add these paths even if the functionality is disabled by |
|
|
|
dnl the user (--without-wallet or --without-gui for example). |
|
|
|
dnl the user (--without-wallet for example). |
|
|
|
|
|
|
|
openssl_prefix=`$BREW --prefix openssl 2>/dev/null` |
|
|
|
bdb_prefix=`$BREW --prefix berkeley-db4 2>/dev/null` |
|
|
@ -870,7 +865,7 @@ else |
|
|
|
fi |
|
|
|
|
|
|
|
if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$use_tests = xnononono; then |
|
|
|
AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests]) |
|
|
|
AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon or --enable-tests]) |
|
|
|
fi |
|
|
|
|
|
|
|
AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin]) |
|
|
|