summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-06-13 13:58:14 (GMT)
committerKevin Smith <kevin.smith@isode.com>2016-06-14 19:43:43 (GMT)
commit1dbcf543910b85b53a95461ed4770264e0ddbc4c (patch)
tree0878c2c53987b9e4d49b92351033388606b622d2 /BuildTools/SCons/SConstruct
parent316dadfb879b875dd3298b7ff221a05582014ac2 (diff)
downloadswift-1dbcf543910b85b53a95461ed4770264e0ddbc4c.zip
swift-1dbcf543910b85b53a95461ed4770264e0ddbc4c.tar.bz2
Re-enable support for system libminiupnpc and libnatpmp
Test-Information: Unit and integration tests pass with system libs on Debian 8.5. Change-Id: Ibcf7a1e07071d5de10c9d99c9b38e67b747f45eb
Diffstat (limited to 'BuildTools/SCons/SConstruct')
-rw-r--r--BuildTools/SCons/SConstruct6
1 files changed, 2 insertions, 4 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index c3e64ee..70cd9d8 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -436,8 +436,7 @@ if env["experimental_ft"] :
libminiupnpc_flags["CPPPATH"] = [env["libminiupnpc_includedir"]]
libminiupnpc_conf_env.MergeFlags(libminiupnpc_flags)
conf = Configure(libminiupnpc_conf_env)
- if conf.CheckCHeader("miniupnpc.h") and conf.CheckLib(env["libminiupnpc_libname"]) and False :
- # ^ False because APIs aren't stable
+ if conf.CheckCHeader("miniupnpc.h") and conf.CheckLib(env["libminiupnpc_libname"]) :
env["HAVE_LIBMINIUPNPC"] = 1
env["LIBMINIUPNPC_FLAGS"] = { "LIBS": ["miniupnpc"] }
env["LIBMINIUPNPC_FLAGS"].update(libminiupnpc_flags)
@@ -457,8 +456,7 @@ if env["experimental_ft"] :
libnatpmp_flags["CPPPATH"] = [env["libnatpmp_includedir"]]
libnatpmp_conf_env.MergeFlags(libnatpmp_flags)
conf = Configure(libnatpmp_conf_env)
- if conf.CheckCHeader("natpmp.h") and conf.CheckLib(env["libnatpmp_libname"]) and False:
- # ^ False because APIs aren't stable
+ if conf.CheckCHeader("natpmp.h") and conf.CheckLib(env["libnatpmp_libname"]) :
env["HAVE_LIBNATPMP"] = 1
env["LIBNATPMP_FLAGS"] = { "LIBS": ["natpmp"] }
env["LIBNATPMP_FLAGS"].update(libnatpmp_flags)