kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Revert r57092 "configure.in: repeated checks"

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57102 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-12-17 05:27:05 +00:00
parent ccdaec2fe8
commit 860b42cf5a
1 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

70
configure.in
View file

@ -3990,45 +3990,45 @@ AC_ARG_ENABLE(dtrace,
[enable DTrace for tracing inside ruby. enabled by default on systems having dtrace]), [enable DTrace for tracing inside ruby. enabled by default on systems having dtrace]),
[enable_dtrace=$enableval], [enable_dtrace=auto]) [enable_dtrace=$enableval], [enable_dtrace=auto])
if test "${enable_dtrace}" = "auto"; then
if test x"$DTRACE" != x -a x"$cross_compiling" != xyes; then
RUBY_DTRACE_AVAILABLE()
enable_dtrace=$rb_cv_dtrace_available
else
enable_dtrace=no
fi
fi
LIBRUBY_A_OBJS='$(OBJS)' LIBRUBY_A_OBJS='$(OBJS)'
DTRACE_REBUILD= DTRACE_REBUILD=
AS_CASE(["${enable_dtrace}"], if test "${enable_dtrace}" = "yes"; then
[yes|auto], [ if test -z "$DTRACE"; then
RUBY_DTRACE_AVAILABLE() AC_MSG_ERROR([dtrace(1) is missing])
], [ elif test "$cross_compiling" = yes; then
rb_cv_dtrace_available=no AC_MSG_ERROR([--enable-dtrace, however, cross compiling])
]) else
AS_IF([test "${enable_dtrace}" = yes], [dnl RUBY_DTRACE_AVAILABLE()
AS_IF([test -z "$DTRACE"], [dnl enable_dtrace=$rb_cv_dtrace_available
AC_MSG_ERROR([dtrace(1) is missing]) if test "${enable_dtrace}" = "no"; then
], [test "$cross_compiling" = yes], [dnl AC_MSG_ERROR([--enable-dtrace, however, USDT is not available])
AC_MSG_ERROR([--enable-dtrace, however, cross compiling]) fi
], [test "${rb_cv_dtrace_available}" = "no"], [dnl RUBY_DTRACE_POSTPROCESS()
AC_MSG_ERROR([--enable-dtrace, however, USDT is not available]) if test "$rb_cv_prog_dtrace_g" != 'no'; then
]) DTRACE_OBJ='probes.$(OBJEXT)'
]) fi
AS_CASE([$rb_cv_dtrace_available], if test "$rb_cv_prog_dtrace_g" = 'rebuild'; then
[yes*], [dnl DTRACE_REBUILD=yes
RUBY_DTRACE_POSTPROCESS() LIBRUBY_A_OBJS='$(DTRACE_GLOMMED_OBJ)'
AS_CASE(["$rb_cv_prog_dtrace_g"], fi
[no], [], AS_CASE("${target_os}", [freebsd*], [
[rebuild], [dnl # FreeBSD's dtrace requires libelf
DTRACE_REBUILD=yes LIBS="-lelf $LIBS"
LIBRUBY_A_OBJS='$(DTRACE_GLOMMED_OBJ)' ])
], fi
[dnl
DTRACE_OBJ='probes.$(OBJEXT)'
]
)
AS_CASE("${target_os}", [freebsd*], [dnl
# FreeBSD's dtrace requires libelf
LIBS="-lelf $LIBS"
])
DTRACE_EXT=d DTRACE_EXT=d
], [dnl else
enable_dtrace=no
DTRACE_EXT=dmyh DTRACE_EXT=dmyh
]) fi
AC_SUBST(DTRACE_EXT) AC_SUBST(DTRACE_EXT)
AC_SUBST(DTRACE_OBJ) AC_SUBST(DTRACE_OBJ)
AC_SUBST(DTRACE_REBUILD) AC_SUBST(DTRACE_REBUILD)