naruse	2012-11-20 10:18:18 +0900 (Tue, 20 Nov 2012)

  New Revision: 37739

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37739

  Log:
    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.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 37738)
+++ configure.in	(revision 37739)
@@ -2731,8 +2731,8 @@
 
 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 @@
         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
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37738)
+++ ChangeLog	(revision 37739)
@@ -1,10 +1,3 @@
-Mon Nov 19 22:55:48 2012  Naohisa Goto  <ngotogenome@g...>
-
-	* 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@g...>
 
 	* vm_dump.c: not to include probes.h because the code does not depend

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/