From c2f184fa2a42294baedc5f293f8f6d1b0f82a53e Mon Sep 17 00:00:00 2001
From: lbrynaut <lbrynaut@protonmail.com>
Date: Wed, 9 Jan 2019 06:36:11 -0600
Subject: [PATCH] Modify ICU discovery and add ICU linkage for tests Rename
 claimtrieForks to claimtrieforks for consistency Update a typo in rpcwallet

---
 configure.ac                                   | 8 ++++----
 src/Makefile.am                                | 2 +-
 src/Makefile.test.include                      | 2 +-
 src/{claimtrieForks.cpp => claimtrieforks.cpp} | 0
 src/wallet/rpcwallet.cpp                       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename src/{claimtrieForks.cpp => claimtrieforks.cpp} (100%)

diff --git a/configure.ac b/configure.ac
index d83c413cb..20ed2d537 100644
--- a/configure.ac
+++ b/configure.ac
@@ -743,6 +743,10 @@ 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"$PKG_CONFIG" = "x"; then
@@ -786,10 +790,6 @@ if test x$use_pkgconfig = xyes; then
     ]
   )
 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_LIBS $ICU_LIBS])
   AC_MSG_WARN([Using CPPFLAGS $CPPFLAGS])
diff --git a/src/Makefile.am b/src/Makefile.am
index 1ee15e719..08455a45c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -191,7 +191,7 @@ libbitcoin_server_a_SOURCES = \
   merkleblock.cpp \
   miner.cpp \
   claimtrie.cpp \
-  claimtrieForks.cpp \
+  claimtrieforks.cpp \
   net.cpp \
   noui.cpp \
   policy/fees.cpp \
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index b8b92de9a..837663ba1 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -108,7 +108,7 @@ if ENABLE_WALLET
 test_test_lbrycrd_LDADD += $(LIBBITCOIN_WALLET)
 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)
 
 if ENABLE_ZMQ
diff --git a/src/claimtrieForks.cpp b/src/claimtrieforks.cpp
similarity index 100%
rename from src/claimtrieForks.cpp
rename to src/claimtrieforks.cpp
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 1e83adddc..0c2deb3ca 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -404,7 +404,7 @@ void CreateClaim(CScript& claimScript, CAmount nAmount, CWalletTx& wtxNew)
         throw JSONRPCError(RPC_WALLET_ERROR, strError);
     }
     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)