diff options
Diffstat (limited to 'BuildTools')
-rw-r--r-- | BuildTools/SCons/SConstruct | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index dafd2b0..de24728 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -371,83 +371,81 @@ conf.Finish() # Fallback to bundled LibIDN if not env.get("HAVE_ICU", False) and not env.get("HAVE_LIBIDN", False) : if env.get("libidn_bundled_enable", True) : env["HAVE_LIBIDN"] = 1 env["LIBIDN_BUNDLED"] = 1 elif env.get("need_idn", True): print "Error: ICU and LIBIDN not found, and libidn_bundled_enable is false" Exit(1) else: print "Proceeding without an IDN library because need_idn was false. This will break all internal binaries" # Unbound if env["unbound"] : env["LDNS_BUNDLED"] = 1 env["UNBOUND_BUNDLED"] = 1 else : env["LDNS_FLAGS"] = {} env["UNBOUND_FLAGS"] = {} # LibMiniUPnPc if env["experimental_ft"] : libminiupnpc_flags = {"CPPPATH": ["/usr/include/miniupnpc/"]} libminiupnpc_conf_env = conf_env.Clone() if env.get("libminiupnpc_libdir", None) : libminiupnpc_flags["LIBPATH"] = [env["libminiupnpc_libdir"]] if env.get("libminiupnpc_includedir", None) : 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) else : env["LIBMINIUPNPC_BUNDLED"] = 1 conf.Finish() else : env["LIBMINIUPNPC_FLAGS"] = {} # LibNATPMP if env["experimental_ft"] : libnatpmp_flags = {} libnatpmp_conf_env = conf_env.Clone() if env.get("libnatpmp_libdir", None) : libnatpmp_flags["LIBPATH"] = [env["libnatpmp_libdir"]] if env.get("libnatpmp_includedir", None) : 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) else : env["LIBNATPMP_BUNDLED"] = 1 conf.Finish() else : env["LIBNATPMP_FLAGS"] = {} # SQLite if env["experimental"] : sqlite_conf_env = conf_env.Clone() sqlite_flags = {} if env.get("sqlite_libdir", None) : sqlite_flags["LIBPATH"] = [env["sqlite_libdir"]] if env.get("sqlite_includedir", None) : sqlite_flags["CPPPATH"] = [env["sqlite_includedir"]] sqlite_conf_env.MergeFlags(sqlite_flags) conf = Configure(sqlite_conf_env) if conf.CheckCHeader("sqlite3.h") and conf.CheckLib(env["sqlite_libname"]) and not env.get("sqlite_force_bundled", False): env["HAVE_SQLITE"] = 1 env["SQLITE_FLAGS"] = { "LIBS": [env["sqlite_libname"]] } env["SQLITE_FLAGS"].update(sqlite_flags) else : env["SQLITE_BUNDLED"] = 1 conf.Finish() else : env["SQLITE_FLAGS"] = {} |