Merge branch 'upstream-openssl' into restricted_routes

This commit is contained in:
Jeff Becker 2016-06-25 10:55:22 -04:00
commit 9a5984d750
No known key found for this signature in database
GPG key ID: AB950234D6EA286B
23 changed files with 314 additions and 237 deletions

View file

@ -44,7 +44,7 @@ endif
# UPNP Support (miniupnpc 1.5 or 1.6)
ifeq ($(USE_UPNP),1)
LDFLAGS += -ldl
LDFLAGS += -lminiupnpc
CXXFLAGS += -DUSE_UPNP
endif