diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-09-01 10:28:27 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-09-01 10:28:33 +0200 |
| commit | 107922663b9a53f37a0201ed2f211b1292b686bf (patch) | |
| tree | 2cee619e19660eef69c6d79d247ad4f48e341217 /src | |
| parent | 01113f7b434f0e7a374449a289b3da398bbe4d2c (diff) | |
| parent | b144a74a08a856997f48a3c83f0bd080cf9432f9 (diff) | |
| download | bitcoin-107922663b9a53f37a0201ed2f211b1292b686bf.tar.xz | |
Merge pull request #4767
b144a74 depends: bump miniupnpc to 1.9.20140701. (Cory Fields)
f628127 depends: bump openssl to 1.0.1i (Cory Fields)
9f7f504 build: add -DMINIUPNP_STATICLIB for new version (Cory Fields)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 655bfc88c3..35fca6570f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -135,7 +135,7 @@ obj/build.h: FORCE libbitcoin_util_a-version.$(OBJEXT): obj/build.h # server: shared between bitcoind and bitcoin-qt -libbitcoin_server_a_CPPFLAGS = $(BITCOIN_INCLUDES) +libbitcoin_server_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) libbitcoin_server_a_SOURCES = \ addrman.cpp \ alert.cpp \ |