naruse	2012-11-19 15:11:36 +0900 (Mon, 19 Nov 2012)

  New Revision: 37717

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

  Log:
    * configure.in: fix didn't enable_dtrace=yes on auto.
    
    * configure.in: see enable_dtrace for adding libelf on FreeBSD.
    
    * common.mk: VPATH is not needed.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 37716)
+++ configure.in	(revision 37717)
@@ -1286,10 +1286,6 @@
 		AC_DEFINE(BROKEN_SETREGID, 1)
                 ac_cv_sizeof_rlim_t=8],
 [freebsd*], [	LIBS="-lm $LIBS"
-		if test "${rb_cv_prog_dtrace_g}" = "yes"; then
-			# FreeBSD's dtrace requires libelf
-			LIBS="-lelf $LIBS"
-		fi
 		ac_cv_func_getpeername=no
 		ac_cv_func_getsockname=no
 		ac_cv_func_shutdown=no
@@ -2741,10 +2737,10 @@
 if test "${enable_dtrace}" = "auto"; then
     if test x"$DTRACE" != x -a x"$cross_compiling" != xyes; then
         RUBY_DTRACE_POSTPROCESS()
+        enable_dtrace=yes
         if test "$rb_cv_prog_dtrace_g" = 'yes'; then
             RUBY_DTRACE_BSD_BROKEN([enable_dtrace=no], [enable_dtrace=yes])
         else
-            enable_dtrace=yes
             AS_CASE(["$target_os"],
             [freebsd*], [enable_dtrace=no]
             )
@@ -2778,6 +2774,11 @@
 AC_SUBST(DTRACE_GLOMMED_OBJ)
 AC_SUBST(LIBRUBY_A_OBJS)
 
+if test "${enable_dtrace}" = "yes"; then
+    # FreeBSD's dtrace requires libelf
+    LIBS="-lelf $LIBS"
+fi
+
 }
 { # build section
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37716)
+++ ChangeLog	(revision 37717)
@@ -1,3 +1,11 @@
+Mon Nov 19 15:09:07 2012  NARUSE, Yui  <naruse@r...>
+
+	* configure.in: fix didn't enable_dtrace=yes on auto.
+
+	* configure.in: see enable_dtrace for adding libelf on FreeBSD.
+
+	* common.mk: VPATH is not needed.
+
 Mon Nov 19 14:55:51 2012  Koichi Sasada  <ko1@a...>
 
 	* thread.c: add `Thread#backtrace_locations' method.
Index: common.mk
===================================================================
--- common.mk	(revision 37716)
+++ common.mk	(revision 37717)
@@ -435,7 +435,7 @@
 clean-local:: PHONY
 	$(Q)$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
 	$(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
-	$(Q)$(RM) y.tab.c y.output encdb.h transdb.h prelude.c config.log rbconfig.rb $(ruby_pc) {$(VPATH)}probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT)
+	$(Q)$(RM) y.tab.c y.output encdb.h transdb.h prelude.c config.log rbconfig.rb $(ruby_pc) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT)
 clean-ext:: PHONY
 clean-golf: PHONY
 	$(Q)$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
@@ -460,7 +460,7 @@
 
 realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
 realclean-local:: distclean-local
-	$(Q)$(RM) parse.c parse.h lex.c newline.c revision.h {$(VPATH)}probes.dmyh
+	$(Q)$(RM) parse.c parse.h lex.c newline.c revision.h
 realclean-ext::
 realclean-golf: distclean-golf
 realclean-capi: PHONY

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