Auto merge of #800 - str4d:592-disable-comparison-utility, r=defuse
Disable comparison utility Also fixes `configure` to check that Java is present if `--with-comparison-tool` is set. Closes #592
This commit is contained in:
commit
9b7606fb6e
|
@ -323,6 +323,9 @@ case $host in
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if test x$use_comparison_tool != xno; then
|
if test x$use_comparison_tool != xno; then
|
||||||
|
if test x$JAVA = x; then
|
||||||
|
AC_MSG_ERROR("comparison tool set but java not found")
|
||||||
|
fi
|
||||||
AC_SUBST(JAVA_COMPARISON_TOOL, $use_comparison_tool)
|
AC_SUBST(JAVA_COMPARISON_TOOL, $use_comparison_tool)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -17,9 +17,10 @@ fi
|
||||||
if test -z $with_protoc_bindir; then
|
if test -z $with_protoc_bindir; then
|
||||||
with_protoc_bindir=$prefix/native/bin
|
with_protoc_bindir=$prefix/native/bin
|
||||||
fi
|
fi
|
||||||
if test -z $with_comparison_tool; then
|
# Disable comparison utility (#592)
|
||||||
with_comparison_tool=$prefix/native/share/BitcoindComparisonTool_jar/BitcoindComparisonTool.jar
|
#if test -z $with_comparison_tool; then
|
||||||
fi
|
# with_comparison_tool=$prefix/native/share/BitcoindComparisonTool_jar/BitcoindComparisonTool.jar
|
||||||
|
#fi
|
||||||
|
|
||||||
|
|
||||||
if test -z $enable_wallet && test -n "@no_wallet@"; then
|
if test -z $enable_wallet && test -n "@no_wallet@"; then
|
||||||
|
|
Loading…
Reference in New Issue