Browse Source

comment out gnutls check in wscript until it's used

v0.7.4-release
Ryan 16 years ago
parent
commit
452d3f1418
  1. 12
      wscript

12
wscript

@ -31,6 +31,7 @@ def configure(conf):
conf.env["USE_DEBUG"] = Options.options.debug conf.env["USE_DEBUG"] = Options.options.debug
conf.check(lib='profiler', uselib_store='PROFILER')
if sys.platform.startswith("freebsd"): if sys.platform.startswith("freebsd"):
if not conf.check(lib="execinfo", libpath=['/usr/lib', '/usr/local/lib'], uselib_store="EXECINFO"): if not conf.check(lib="execinfo", libpath=['/usr/lib', '/usr/local/lib'], uselib_store="EXECINFO"):
@ -41,15 +42,16 @@ def configure(conf):
# liboi config # liboi config
print "--- liboi ---" print "--- liboi ---"
if conf.check_cfg(package='gnutls', args='--cflags --libs', uselib_store="GNUTLS"):
conf.define("HAVE_GNUTLS", 1)
# Not using TLS yet
# if conf.check_cfg(package='gnutls', args='--cflags --libs', uselib_store="GNUTLS"):
# conf.define("HAVE_GNUTLS", 1)
conf.define("HAVE_CONFIG_H", 1) conf.define("HAVE_CONFIG_H", 1)
conf.env.append_value("CCFLAGS", "-DEIO_STACKSIZE=%d" % (4096*8)) conf.env.append_value("CCFLAGS", "-DEIO_STACKSIZE=%d" % (4096*8))
conf.check(lib='profiler', uselib_store='PROFILER')
# Split off debug variant before adding variant specific defines # Split off debug variant before adding variant specific defines
debug_env = conf.env.copy() debug_env = conf.env.copy()
conf.set_env_name('debug', debug_env) conf.set_env_name('debug', debug_env)
@ -109,7 +111,7 @@ def build(bld):
oi.includes = "deps/liboi/ deps/libev/" oi.includes = "deps/liboi/ deps/libev/"
oi.name = "oi" oi.name = "oi"
oi.target = "oi" oi.target = "oi"
oi.uselib = "GNUTLS" # oi.uselib = "GNUTLS"
oi.install_path = None oi.install_path = None
if bld.env["USE_DEBUG"]: if bld.env["USE_DEBUG"]:
oi.clone("debug") oi.clone("debug")

Loading…
Cancel
Save