Commit bde90880 by Konstantin Käfer

Merge pull request #24 from audriusk/master

Fix pkg-config usage to correctly work with node-waf
parents c3b2bbc2 a054e157
import Options import Options
from Configure import ConfigurationError
from os.path import exists from os.path import exists
from shutil import copy2 as copy from shutil import copy2 as copy
...@@ -14,8 +15,8 @@ def configure(conf): ...@@ -14,8 +15,8 @@ def configure(conf):
conf.check_tool("compiler_cxx") conf.check_tool("compiler_cxx")
conf.check_tool("node_addon") conf.check_tool("node_addon")
try: try:
conf.find_program('pkg-config') conf.find_program('pkg-config', mandatory=True)
except conf.errors.ConfigurationError: except ConfigurationError:
conf.check(lib="sqlite3", libpath=['/usr/local/lib', '/opt/local/lib'], conf.check(lib="sqlite3", libpath=['/usr/local/lib', '/opt/local/lib'],
uselib_store="SQLITE3", mandatory=True) uselib_store="SQLITE3", mandatory=True)
else: else:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment