diff options
| author | Gregory Maxwell <greg@xiph.org> | 2012-08-23 14:17:35 -0700 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2012-08-23 14:17:35 -0700 |
| commit | 1bcd3f26c022f7a2fcc1a01df6d9cae0cb13f8d7 (patch) | |
| tree | 4b58c78a56e1e2481e218cd9f9042620a3839bfc /src/makefile.unix | |
| parent | 579d011738002b77e3a5f8713461eaa3de492e00 (diff) | |
| parent | 9655d73f49cd4da189ddb2ed708c26dc4cb3babe (diff) | |
| download | bitcoin-1bcd3f26c022f7a2fcc1a01df6d9cae0cb13f8d7.tar.xz | |
Merge pull request #1431 from luke-jr/opt_ipv6
Make IPv6 support optional again (defaults to enabled)
Diffstat (limited to 'src/makefile.unix')
| -rw-r--r-- | src/makefile.unix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/makefile.unix b/src/makefile.unix index c9a09ad020..ac42743d8e 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -3,10 +3,11 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. USE_UPNP:=0 +USE_IPV6:=1 LINK:=$(CXX) -DEFS=-DUSE_IPV6 -DBOOST_SPIRIT_THREADSAFE +DEFS=-DBOOST_SPIRIT_THREADSAFE DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH)) LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH)) @@ -43,6 +44,10 @@ ifneq (${USE_UPNP}, -) DEFS += -DUSE_UPNP=$(USE_UPNP) endif +ifneq (${USE_IPV6}, -) + DEFS += -DUSE_IPV6=$(USE_IPV6) +endif + LIBS+= \ -Wl,-B$(LMODE2) \ -l z \ |