From b668c4c302a8ba69234e067c061f9607353c5fc5 Mon Sep 17 00:00:00 2001
From: hagen <hagen@mail.i2p>
Date: Mon, 27 Jun 2016 13:00:00 +0000
Subject: [PATCH] * add global switch USE_UPNP to makefile

---
 Makefile          | 1 +
 Makefile.homebrew | 2 +-
 Makefile.linux    | 2 +-
 Makefile.mingw    | 4 ++--
 Makefile.osx      | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 4cc313a9..fe8ae7e3 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ include filelist.mk
 
 USE_AESNI  := yes
 USE_STATIC := no
+USE_UPNP   := no
 
 ifeq ($(UNAME),Darwin)
 	DAEMON_SRC += DaemonLinux.cpp
diff --git a/Makefile.homebrew b/Makefile.homebrew
index 6ce513fe..f57f6495 100644
--- a/Makefile.homebrew
+++ b/Makefile.homebrew
@@ -8,7 +8,7 @@ INCFLAGS = -I${SSLROOT}/include -I${BOOSTROOT}/include
 LDFLAGS = -L${SSLROOT}/lib -L${BOOSTROOT}/lib
 LDLIBS = -lz -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
 
-ifeq ($(USE_UPNP),1)
+ifeq ($(USE_UPNP),yes)
   LDFLAGS += -ldl
   CXXFLAGS += -DUSE_UPNP
 endif
diff --git a/Makefile.linux b/Makefile.linux
index 324d9467..1376260a 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -43,7 +43,7 @@ else
 endif
 
 # UPNP Support (miniupnpc 1.5 or 1.6)
-ifeq ($(USE_UPNP),1)
+ifeq ($(USE_UPNP),yes)
   LDFLAGS += -lminiupnpc
   CXXFLAGS += -DUSE_UPNP
 endif
diff --git a/Makefile.mingw b/Makefile.mingw
index 682221d1..5cf16bf5 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -9,7 +9,7 @@ LDFLAGS = -Wl,-rpath,/usr/local/lib \
   -L/usr/local/lib 
 
 # UPNP Support 
-ifeq ($(USE_UPNP),1)
+ifeq ($(USE_UPNP),yes)
   CXXFLAGS += -DUSE_UPNP -DMINIUPNP_STATICLIB
   LDLIBS = -Wl,-Bstatic -lminiupnpc	
 endif
@@ -37,7 +37,7 @@ ifeq ($(USE_WIN32_APP), yes)
 	DAEMON_OBJS += $(patsubst %.rc,obj/%.o,$(DAEMON_RC))
 endif
 
-ifeq ($(USE_AESNI),1)
+ifeq ($(USE_AESNI),yes)
 	CPU_FLAGS = -maes -DAESNI
 else
 	CPU_FLAGS = -msse
diff --git a/Makefile.osx b/Makefile.osx
index ef236c9a..f40ce1af 100644
--- a/Makefile.osx
+++ b/Makefile.osx
@@ -5,7 +5,7 @@ INCFLAGS = -I/usr/local/include -I/usr/local/ssl/include
 LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib -L/usr/local/ssl/lib
 LDLIBS = -lz -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
 
-ifeq ($(USE_UPNP),1)
+ifeq ($(USE_UPNP),yes)
   LDFLAGS += -ldl
   CXXFLAGS += -DUSE_UPNP
 endif