diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2010-01-12 16:59:14 -0800 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2010-01-12 16:59:14 -0800 |
| commit | 02e52ef8e9e9c6e875e171a49b049d0663cb9739 (patch) | |
| tree | 5909aa05c9e07741deb1ef948b00cb157ac92bab /wscript | |
| parent | a876df6c715bfcff48a1fc518ec0cab9d53f20e4 (diff) | |
| parent | c4397b801acd14b83f1674640346618e39c6ca88 (diff) | |
| download | node-new-02e52ef8e9e9c6e875e171a49b049d0663cb9739.tar.gz | |
Merge branch 'master' into net2
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -7,7 +7,7 @@ from os.path import join, dirname, abspath from logging import fatal cwd = os.getcwd() -VERSION="0.1.23" +VERSION="0.1.25" APPNAME="node.js" import js2c @@ -101,7 +101,9 @@ def conf_subproject (conf, subdir, command=None): def configure(conf): conf.check_tool('compiler_cxx') + if not conf.env.CXX: conf.fatal('c++ compiler not found') conf.check_tool('compiler_cc') + if not conf.env.CC: conf.fatal('c compiler not found') conf.env["USE_DEBUG"] = Options.options.debug @@ -109,6 +111,9 @@ def configure(conf): conf.env.append_value("CCFLAGS", "-rdynamic") conf.env.append_value("LINKFLAGS_DL", "-rdynamic") + if sys.platform.startswith("freebsd"): + conf.check(lib='kvm', uselib_store='KVM') + #if Options.options.debug: # conf.check(lib='profiler', uselib_store='PROFILER') @@ -127,7 +132,7 @@ def configure(conf): #libpath=['/usr/lib', '/usr/local/lib'], uselib_store='GNUTLS'): if conf.check(lib='gpg-error', - #libpath=['/usr/lib', '/usr/local/lib'], + libpath=['/usr/lib', '/usr/local/lib'], uselib_store='GPGERROR'): conf.env.append_value("CCFLAGS", "-DEVCOM_HAVE_GNUTLS=1") conf.env.append_value("CXXFLAGS", "-DEVCOM_HAVE_GNUTLS=1") @@ -349,7 +354,7 @@ def build(bld): """ node.add_objects = 'ev eio evcom http_parser coupling' node.uselib_local = '' - node.uselib = 'UDNS V8 EXECINFO DL GPGERROR GNUTLS' + node.uselib = 'GNUTLS GPGERROR UDNS V8 EXECINFO DL KVM' node.install_path = '${PREFIX}/lib' node.install_path = '${PREFIX}/bin' |