BTCPrivate
/
BitcoinPrivate-legacy
mirror of https://github.com/BTCPrivate/BitcoinPrivate-legacy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

qt5: fix --with-qt with no arguments

This commit is contained in:
Cory Fields 2014-01-10 16:28:57 -05:00
parent 2691cbc4b3
commit 371f3f6ba5
4 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qa/rpc-tests/send.sh Executable file
View File

@ -0,0 +1,14 @@
#!/bin/bash
TIMEOUT=10
SIGNAL=HUP
if [ $# -eq 0 ]; then
echo -e "Usage:\t$0 <cmd>"
echo -e "\tRuns <cmd> and wait ${TIMEOUT} seconds or until SIG${SIGNAL} is received."
echo -e "\tReturns: 0 if SIG${SIGNAL} is received, 1 otherwise."
exit 0
fi
trap '[[ ${PID} ]] && kill ${PID}' ${SIGNAL}
"$@"
sleep ${TIMEOUT} & PID=$!
wait ${PID} && exit 1
exit 0

5
qa/rpc-tests/util.sh
View File

@ -23,6 +23,7 @@ function CreateDataDir {
echo "rpcuser=rt" >> $CONF echo "rpcuser=rt" >> $CONF
echo "rpcpassword=rt" >> $CONF echo "rpcpassword=rt" >> $CONF
echo "rpcwait=1" >> $CONF echo "rpcwait=1" >> $CONF
echo "walletnotify=killall -HUP `basename ${SENDANDWAIT}`" >> $CONF
shift shift
while (( "$#" )); do while (( "$#" )); do
echo $1 >> $CONF echo $1 >> $CONF
@ -59,7 +60,7 @@ function Send {
to=$2 to=$2
amount=$3 amount=$3
address=$(Address $to) address=$(Address $to)
txid=$( $CLI $from sendtoaddress $address $amount ) txid=$( ${SENDANDWAIT} $CLI $from sendtoaddress $address $amount )
} }
# Use: Unspent <datadir> <n'th-last-unspent> <var> # Use: Unspent <datadir> <n'th-last-unspent> <var>
@ -80,7 +81,7 @@ function CreateTxn1 {
# Use: SendRawTxn <datadir> <hex_txn_data> # Use: SendRawTxn <datadir> <hex_txn_data>
function SendRawTxn { function SendRawTxn {
$CLI $1 sendrawtransaction $2 ${SENDANDWAIT} $CLI $1 sendrawtransaction $2
} }
# Use: GetBlocks <datadir> # Use: GetBlocks <datadir>

1
qa/rpc-tests/wallet.sh
View File

@ -12,6 +12,7 @@ BITCOIND=${1}/bitcoind
CLI=${1}/bitcoin-cli CLI=${1}/bitcoin-cli
DIR="${BASH_SOURCE%/*}" DIR="${BASH_SOURCE%/*}"
SENDANDWAIT="${DIR}/send.sh"
if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
. "$DIR/util.sh" . "$DIR/util.sh"

10
src/m4/bitcoin_qt.m4
View File

@ -1,7 +1,7 @@
dnl Helper for cases where a qt dependency is not met. dnl Helper for cases where a qt dependency is not met.
dnl Output: If qt version is auto, set bitcoin_enable_qt to false. Else, exit. dnl Output: If qt version is auto, set bitcoin_enable_qt to false. Else, exit.
AC_DEFUN([BITCOIN_QT_FAIL],[ AC_DEFUN([BITCOIN_QT_FAIL],[
if test "x$bitcoin_qt_want_version" = "xauto"; then if test "x$bitcoin_qt_want_version" = "xauto" && test x$bitcoin_qt_force != xyes; then
if test x$bitcoin_enable_qt != xno; then if test x$bitcoin_enable_qt != xno; then
AC_MSG_WARN([$1; bitcoin-qt frontend will not be built]) AC_MSG_WARN([$1; bitcoin-qt frontend will not be built])
fi fi
@ -50,7 +50,13 @@ AC_DEFUN([BITCOIN_QT_INIT],[
AC_ARG_WITH([qt], AC_ARG_WITH([qt],
[AS_HELP_STRING([--with-qt], [AS_HELP_STRING([--with-qt],
[with qt (no|qt4|qt5|auto. default is auto, qt4 tried first.)])], [with qt (no|qt4|qt5|auto. default is auto, qt4 tried first.)])],
[bitcoin_qt_want_version=$withval], [
bitcoin_qt_want_version=$withval
if test x$bitcoin_qt_want_version = xyes; then
bitcoin_qt_force=yes
bitcoin_qt_want_version=auto
fi
],
[bitcoin_qt_want_version=auto]) [bitcoin_qt_want_version=auto])
AC_ARG_WITH([qt-incdir],[AS_HELP_STRING([--with-qt-incdir=INC_DIR],[specify qt include path (overridden by pkgconfig)])], [qt_include_path=$withval], []) AC_ARG_WITH([qt-incdir],[AS_HELP_STRING([--with-qt-incdir=INC_DIR],[specify qt include path (overridden by pkgconfig)])], [qt_include_path=$withval], [])