From c9d71db1e56ce77584903589ce15f90b8ac0821b Mon Sep 17 00:00:00 2001
From: Tom Zander <tomz@freedommail.ch>
Date: Mon, 15 Feb 2016 10:55:04 +0000
Subject: [PATCH] Allow src!=build dir building

---
 src/Makefile.am         | 4 ++--
 src/Makefile.qt.include | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 4c12e550b4d..aa7679ca5ed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,8 +7,8 @@ AM_CPPFLAGS = $(HARDENED_CPPFLAGS)
 if EMBEDDED_LEVELDB
 LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/include
 LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/helpers/memenv
-LIBLEVELDB += $(builddir)/leveldb/libleveldb.a
-LIBMEMENV  += $(builddir)/leveldb/libmemenv.a
+LIBLEVELDB += $(top_srcdir)/src/leveldb/libleveldb.a
+LIBMEMENV  += $(top_srcdir)/src/leveldb/libmemenv.a
 
 # NOTE: This dependency is not strictly necessary, but without it make may try to build both in parallel, which breaks the LevelDB build system in a race
 $(LIBLEVELDB): $(LIBMEMENV)
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index a390d96a9f0..76354e6bdda 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -156,6 +156,10 @@ QT_MOC = \
   qt/overviewpage.moc \
   qt/rpcconsole.moc
 
+if ENABLE_WALLET
+MOC_DEFS += -DENABLE_WALLET=1
+endif
+
 QT_QRC_CPP = qt/qrc_bitcoin.cpp
 QT_QRC = qt/bitcoin.qrc
 QT_QRC_LOCALE_CPP = qt/qrc_bitcoin_locale.cpp