ruby-changes:25620
From: nobu <ko1@a...>
Date: Fri, 16 Nov 2012 17:31:06 +0900 (JST)
Subject: [ruby-changes:25620] nobu:r37677 (trunk): configure.in: move after AC_PROG_CC
nobu 2012-11-16 17:30:56 +0900 (Fri, 16 Nov 2012) New Revision: 37677 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37677 Log: configure.in: move after AC_PROG_CC * configure.in (DTRACE): move after AC_PROG_CC since cross_compiling is set in it. Modified files: trunk/ChangeLog trunk/configure.in Index: configure.in =================================================================== --- configure.in (revision 37676) +++ configure.in (revision 37677) @@ -373,14 +373,6 @@ AC_CHECK_TOOL(CC, gcc) fi -AC_CHECK_PROG([DTRACE], [${ac_tool_prefix}dtrace], [${ac_tool_prefix}dtrace]) -if test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"; then - AC_CHECK_PROG([DTRACE], [dtrace], [dtrace]) -fi -AS_CASE(["$target_os"], -[freebsd*], [DTRACE=] -) - AC_PROG_CC AC_PROG_CXX RUBY_MINGW32 @@ -396,6 +388,14 @@ linker_flag= fi +AC_CHECK_PROG([DTRACE], [${ac_tool_prefix}dtrace], [${ac_tool_prefix}dtrace]) +if test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"; then + AC_CHECK_PROG([DTRACE], [dtrace], [dtrace]) +fi +AS_CASE(["$target_os"], +[freebsd*], [DTRACE=] +) + RUBY_PROG_GNU_LD RUBY_CPPOUTFILE Index: ChangeLog =================================================================== --- ChangeLog (revision 37676) +++ ChangeLog (revision 37677) @@ -1,5 +1,8 @@ -Fri Nov 16 16:24:42 2012 Nobuyoshi Nakada <nobu@r...> +Fri Nov 16 17:30:50 2012 Nobuyoshi Nakada <nobu@r...> + * configure.in (DTRACE): move after AC_PROG_CC since cross_compiling + is set in it. + * configure.in (DTRACE): ignore non-prefixed version if cross-compiling. -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/