LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Modify ICU discovery and add ICU linkage for tests

Browse source 
Rename claimtrieForks to claimtrieforks for consistency
Update a typo in rpcwallet
This commit is contained in:
lbrynaut 2019-01-09 06:36:11 -06:00 committed by Brannon King
parent d740e3761c
commit c2f184fa2a
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -743,6 +743,10 @@ fi
fi fi
ICU_CPPFLAGS="-I$ICU_PREFIX/include"
CPPFLAGS="$ICU_CPPFLAGS $CPPFLAGS"
ICU_LIBS="-L$ICU_PREFIX/lib -licui18n -licuuc -licudata -dl"
if test x$use_pkgconfig = xyes; then if test x$use_pkgconfig = xyes; then
if test x"$PKG_CONFIG" = "x"; then if test x"$PKG_CONFIG" = "x"; then
@ -786,10 +790,6 @@ if test x$use_pkgconfig = xyes; then
] ]
) )
else else
ICU_CPPFLAGS="-I$ICU_PREFIX/include"
CPPFLAGS="$ICU_CPPFLAGS $CPPFLAGS"
ICU_LIBS="-L$ICU_PREFIX/lib -licui18n -licuuc -licudata -dl"
AC_MSG_WARN([Using ICU_CPPFLAGS $ICU_CPPFLAGS]) AC_MSG_WARN([Using ICU_CPPFLAGS $ICU_CPPFLAGS])
AC_MSG_WARN([Using ICU_LIBS $ICU_LIBS]) AC_MSG_WARN([Using ICU_LIBS $ICU_LIBS])
AC_MSG_WARN([Using CPPFLAGS $CPPFLAGS]) AC_MSG_WARN([Using CPPFLAGS $CPPFLAGS])

2
src/Makefile.am
View file

@ -191,7 +191,7 @@ libbitcoin_server_a_SOURCES = \
merkleblock.cpp \ merkleblock.cpp \
miner.cpp \ miner.cpp \
claimtrie.cpp \ claimtrie.cpp \
claimtrieForks.cpp \ claimtrieforks.cpp \
net.cpp \ net.cpp \
noui.cpp \ noui.cpp \
policy/fees.cpp \ policy/fees.cpp \

2
src/Makefile.test.include
View file

@ -108,7 +108,7 @@ if ENABLE_WALLET
test_test_lbrycrd_LDADD += $(LIBBITCOIN_WALLET) test_test_lbrycrd_LDADD += $(LIBBITCOIN_WALLET)
endif endif
test_test_lbrycrd_LDADD += $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) test_test_lbrycrd_LDADD += $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(ICU_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS)
test_test_lbrycrd_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_test_lbrycrd_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
if ENABLE_ZMQ if ENABLE_ZMQ

0
src/claimtrieForks.cpp → src/claimtrieforks.cpp
View file

2
src/wallet/rpcwallet.cpp
View file

@ -404,7 +404,7 @@ void CreateClaim(CScript& claimScript, CAmount nAmount, CWalletTx& wtxNew)
throw JSONRPCError(RPC_WALLET_ERROR, strError); throw JSONRPCError(RPC_WALLET_ERROR, strError);
} }
if (!pwalletMain->CommitTransaction(wtxNew, reservekey)) if (!pwalletMain->CommitTransaction(wtxNew, reservekey))
throw JSONRPCError(RPC_WALLET_ERROR, "Error: The transaction was rejected! This might hapen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."); throw JSONRPCError(RPC_WALLET_ERROR, "Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.");
} }
UniValue claimname(const UniValue& params, bool fHelp) UniValue claimname(const UniValue& params, bool fHelp)