Changeset f44f92d4f37b5e37b4b8ca3147fb7cf8046c635e

Timestamp:

11/14/10 21:20:14 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

577194b9e5c979d7f2361aabd0995da9b2d63898

Parents:

ffc3be463e7c0f0a89f8612492c2d88b56aac3a6

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-11-14T21:20:14Z+0200

Message:

wscript: more waf-1.6 related improvements

Files:

• wscript (modified) (3 diffs)

wscript

@@ -41 +41 @@
 
 def options(opt):
-    opt.tool_options('compiler_c')
-    opt.tool_options('compiler_cxx')
-    opt.tool_options('boost')
-    opt.tool_options('python')
+    opt.load('compiler_c')
+    opt.load('compiler_cxx')
+    opt.load('boost')
+    opt.load('python')
     opt.add_option('--enable-pkg-config-dbus-service-dir', action='store_true', default=False, help='force D-Bus service install dir to be one returned by pkg-config')
     opt.add_option('--enable-liblash', action='store_true', default=False, help='Build LASH compatibility library')
@@ -83 +83 @@
 
 def configure(conf):
-    conf.check_tool('compiler_c')
-    conf.check_tool('compiler_cxx')
-    conf.check_tool('boost')
-    conf.check_tool('python')
+    conf.load('compiler_c')
+    conf.load('compiler_cxx')
+    conf.load('boost')
+    conf.load('python')
     if parallel_debug:
         conf.load('parallel_debug')
 
-    conf.env['LIB_DL'] = ['dl']
+    # dladdr() is used by daemon/sigsegv.c
+    # dlvsym() is used by the alsapid library
+    conf.check_cc(msg="Checking for libdl", lib=['dl'], uselib_store='DL')
+
+    # forkpty() is used by ladishd
+    conf.check_cc(msg="Checking for libutil", lib=['util'], uselib_store='UTIL')
 
     conf.check_cfg(
@@ -303 +308 @@
     daemon = bld.program(source = [], features = 'c cprogram', includes = [bld.path.get_bld()])
     daemon.target = 'ladishd'
-    daemon.uselib = 'DBUS-1 UUID EXPAT'
+    daemon.uselib = 'DBUS-1 UUID EXPAT DL UTIL'
     daemon.ver_header = 'version.h'
-    daemon.env.append_value("LINKFLAGS", ["-lutil", "-ldl", "-Wl,-E"])
+    # Make backtrace function lookup to work for functions in the executable itself
+    daemon.env.append_value("LINKFLAGS", ["-Wl,-E"])
 
     for source in [