From 49c0c51056377819d6289d04baa69e38d9871d24 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 20 Nov 2012 01:18:18 +0000 Subject: [PATCH] Revert "* configure.in (--enable-dtrace): change help message" This reverts commit 029b59ba53d0cc42630d623b52d94cae0df62734. When $rb_cv_prog_dtrace_g is yes on FreeBSD even if /usr/bin/dtrace exists, it means dtrace is disabled on the system. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 ------- configure.in | 8 ++++++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd8b3cc726..8116bc7aed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,3 @@ -Mon Nov 19 22:55:48 2012 Naohisa Goto - - * configure.in (--enable-dtrace): change help message - * configure.in (--enable-dtrace): remove ineffective "else AS_CASE ..." - because the variable $rb_cv_prog_dtrace_g is normally "yes" on - FreeBSD and the AS_CASE is not evaluated on FreeBSD. - Mon Nov 19 21:24:18 2012 Naohisa Goto * vm_dump.c: not to include probes.h because the code does not depend diff --git a/configure.in b/configure.in index e2f82de4be..f2d22ef6f3 100644 --- a/configure.in +++ b/configure.in @@ -2731,8 +2731,8 @@ fi AC_ARG_ENABLE(dtrace, AS_HELP_STRING([--enable-dtrace], - [enable DTrace for tracing ruby's internal. enabled by default on systems having dtrace]), - [enable_dtrace=$enableval], [enable_dtrace=auto]) + [enable DTrace for tracing ruby's internal.]), + [enable_dtrace=$enableval], [enable_dtrace=auto]) if test "${enable_dtrace}" = "auto"; then if test x"$DTRACE" != x -a x"$cross_compiling" != xyes; then @@ -2740,6 +2740,10 @@ if test "${enable_dtrace}" = "auto"; then enable_dtrace=yes if test "$rb_cv_prog_dtrace_g" = 'yes'; then RUBY_DTRACE_BSD_BROKEN([enable_dtrace=no], [enable_dtrace=yes]) + else + AS_CASE(["$target_os"], + [freebsd*], [enable_dtrace=no] + ) fi else enable_dtrace=no