aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.in8
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 <ngotogenome@gmail.com>
-
- * 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 <ngotogenome@gmail.com>
* 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