From 148f5e65123c92f62776a769c54e6318d984225e Mon Sep 17 00:00:00 2001 From: Shigeki Ohtsu Date: Thu, 1 Nov 2012 14:14:46 +0900 Subject: [PATCH] build: fix default dtrace flag on Linux DTrace on Linux should not be enabled by default because not all systems will have the proper headers installed. Only enable when --with-dtrace is passed to the configure script. --- configure | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 48cc6102e36..bd6e0cdf665 100755 --- a/configure +++ b/configure @@ -134,7 +134,7 @@ parser.add_option("--shared-zlib-libname", parser.add_option("--with-dtrace", action="store_true", dest="with_dtrace", - help="Build with DTrace (default is true on supported systems)") + help="Build with DTrace (default is true on sunos)") parser.add_option("--without-dtrace", action="store_true", @@ -386,7 +386,7 @@ def configure_node(o): o['variables']['node_use_dtrace'] = b(not options.without_dtrace) elif sys.platform.startswith('linux'): o['variables']['node_use_dtrace'] = 'false' - o['variables']['node_use_systemtap'] = b(not options.without_dtrace) + o['variables']['node_use_systemtap'] = b(options.with_dtrace) if options.systemtap_includes: o['include_dirs'] += [options.systemtap_includes] elif b(options.with_dtrace) == 'true': @@ -394,6 +394,7 @@ def configure_node(o): 'DTrace is currently only supported on SunOS or Linux systems.') else: o['variables']['node_use_dtrace'] = 'false' + o['variables']['node_use_systemtap'] = 'false' if options.no_ifaddrs: o['defines'] += ['SUNOS_NO_IFADDRS']