Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-10-07 19:02:06 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-10-07 19:02:06 (GMT) |
| commit | f17433cc4d1054dbae8002a1995e0b632e26124a (patch) | |
| tree | 16170e72707a4a3013bc3c15ab214161b91eb421 /BuildTools/SCons | |
| parent | eb982771caed944f441967194df86ddbec21efde (diff) | |
| download | swift-contrib-f17433cc4d1054dbae8002a1995e0b632e26124a.zip swift-contrib-f17433cc4d1054dbae8002a1995e0b632e26124a.tar.bz2 | |
Remove system natpmp and libminiupnp checking completely.
Diffstat (limited to 'BuildTools/SCons')
| -rw-r--r-- | BuildTools/SCons/SConstruct | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 448bdbd..a7b3c78 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -281,89 +281,89 @@ if not env.get("HAVE_LIBXML",0) : expat_conf_env.MergeFlags(expat_flags) conf = Configure(expat_conf_env) if conf.CheckCHeader("expat.h") and conf.CheckLib(env["expat_libname"]) : env["HAVE_EXPAT"] = 1 env["EXPAT_FLAGS"] = { "LIBS": [env["expat_libname"]] } env["EXPAT_FLAGS"].update(expat_flags) conf.Finish() # Bundled expat bundledExpat = False if not env.get("HAVE_EXPAT", 0) and not env.get("HAVE_LIBXML", 0) : print "Expat or LibXML not found. Using bundled Expat" SConscript("#/3rdParty/Expat/SConscript") env["HAVE_EXPAT"] = 1 env["EXPAT_BUNDLED"] = True # LibIDN libidn_conf_env = conf_env.Clone() libidn_flags = {} if env.get("libidn_libdir", None) : libidn_flags["LIBPATH"] = [env["libidn_libdir"]] if env.get("libidn_includedir", None) : libidn_flags["CPPPATH"] = [env["libidn_includedir"]] libidn_conf_env.MergeFlags(libidn_flags) conf = Configure(libidn_conf_env) if conf.CheckCHeader("idna.h") and conf.CheckLib(env["libidn_libname"]) : env["HAVE_LIBIDN"] = 1 env["LIBIDN_FLAGS"] = { "LIBS": [env["libidn_libname"]] } env["LIBIDN_FLAGS"].update(libidn_flags) else : env["LIBIDN_BUNDLED"] = 1 conf.Finish() # LibMiniUPnPc if env["experimental"] : - libminiupnpc_conf_env = conf_env.Clone() - conf = Configure(libminiupnpc_conf_env) - if conf.CheckCHeader("miniupnpc.h") and conf.CheckLib(env["libminiupnpc_libname"]) : - print "NOT IMPLEMENTED YET" - else : - env["LIBMINIUPNPC_BUNDLED"] = 1 - conf.Finish() + #libminiupnpc_conf_env = conf_env.Clone() + #conf = Configure(libminiupnpc_conf_env) + #if conf.CheckCHeader("miniupnpc.h") and conf.CheckLib(env["libminiupnpc_libname"]) : + # print "NOT IMPLEMENTED YET" + #else : + env["LIBMINIUPNPC_BUNDLED"] = 1 + #conf.Finish() else : env["LIBMINIUPNPC_FLAGS"] = {} # LibNATPMP if env["experimental"] : - libnatpmp_conf_env = conf_env.Clone() - conf = Configure(libnatpmp_conf_env) - if conf.CheckCHeader("natpmp.h") and conf.CheckLib(env["libnatpmp_libname"]) : - print "NOT IMPLEMENTED YET" - else : - env["LIBNATPMP_BUNDLED"] = 1 - conf.Finish() + #libnatpmp_conf_env = conf_env.Clone() + #conf = Configure(libnatpmp_conf_env) + #if conf.CheckCHeader("natpmp.h") and conf.CheckLib(env["libnatpmp_libname"]) : + # print "NOT IMPLEMENTED YET" + #else : + env["LIBNATPMP_BUNDLED"] = 1 + #conf.Finish() else : env["LIBNATPMP_FLAGS"] = {} # SQLite #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"]) : # env["HAVE_SQLITE"] = 1 # env["SQLITE_FLAGS"] = { "LIBS": [env["sqlite_libname"]] } # env["SQLITE_FLAGS"].update(sqlite_flags) #else : # env["SQLITE_BUNDLED"] = 1 #conf.Finish() # Lua env["LUA_BUNDLED"] = 1 # Readline conf = Configure(conf_env) if conf.CheckCHeader(["stdio.h", "readline/readline.h"]) and conf.CheckLib("readline") : env["HAVE_READLINE"] = True env["READLINE_FLAGS"] = { "LIBS": ["readline"] } conf.Finish() # Avahi avahi_conf_env = conf_env.Clone() avahi_flags = {} if env.get("avahi_libdir", None) : avahi_flags["LIBPATH"] = [env["avahi_libdir"]] |