From 9f7f504efca27c7d390f121410846b45c1732761 Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Tue, 26 Aug 2014 15:17:18 -0400 Subject: [PATCH] build: add -DMINIUPNP_STATICLIB for new version libminiupnpc changed their required static define to the much more sane "MINIUPNP_STATICLIB". Sadly, they don't respect the old "STATICLIB" for back-compat. Define them both since the old one didn't seem to be conflicting anywhere. Also go ahead and split out the cppflags so that they can be applied only where they're needed. This will help us to build dll's from our libs without having their import/export declspecs poisoned. --- configure.ac | 3 ++- src/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 700f4ab70..dbf7db3a4 100644 --- a/configure.ac +++ b/configure.ac @@ -690,7 +690,7 @@ else AC_MSG_RESULT($use_upnp_default) AC_DEFINE_UNQUOTED([USE_UPNP],[$upnp_setting],[UPnP support not compiled if undefined, otherwise value (0 or 1) determines default state]) if test x$TARGET_OS = xwindows; then - CPPFLAGS="$CPPFLAGS -DSTATICLIB" + MINIUPNPC_CPPFLAGS="-DSTATICLIB -DMINIUPNP_STATICLIB" fi else AC_MSG_RESULT(no) @@ -794,6 +794,7 @@ AC_SUBST(LEVELDB_TARGET_FLAGS) AC_SUBST(BUILD_TEST) AC_SUBST(BUILD_QT) AC_SUBST(BUILD_TEST_QT) +AC_SUBST(MINIUPNPC_CPPFLAGS) AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist]) AC_CONFIG_FILES([qa/pull-tester/run-bitcoind-for-test.sh],[chmod +x qa/pull-tester/run-bitcoind-for-test.sh]) AC_CONFIG_FILES([qa/pull-tester/build-tests.sh],[chmod +x qa/pull-tester/build-tests.sh]) diff --git a/src/Makefile.am b/src/Makefile.am index 655bfc88c..35fca6570 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 \