diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Mon Nov 19 16:17:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (LIBS): libelf is need on only FreeBSD. + Mon Nov 19 16:08:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * common.mk (RUBYLIB): purelib option in runruby.rb is deprecated diff --git a/configure.in b/configure.in index 183d3ba954..f2d22ef6f3 100644 --- a/configure.in +++ b/configure.in @@ -2758,7 +2758,7 @@ if test "${enable_dtrace}" = "yes"; then AC_MSG_ERROR([--enable-dtrace, however, cross compiling]) else RUBY_DTRACE_POSTPROCESS() - if test "$rb_cv_prog_dtrace_g" = 'yes'; then + if test "$rb_cv_prog_dtrace_g" = 'yes'; then RUBY_DTRACE_BSD_BROKEN([AC_MSG_ERROR([--enable-dtrace, however, USDT is broken])], []) DTRACE_OBJ='probes.$(OBJEXT)' DTRACE_GLOMMED_OBJ='ruby-glommed.$(OBJEXT)' @@ -2774,10 +2774,10 @@ AC_SUBST(DTRACE_OBJ) AC_SUBST(DTRACE_GLOMMED_OBJ) AC_SUBST(LIBRUBY_A_OBJS) -if test "${enable_dtrace}" = "yes"; then +AS_CASE("${enable_dtrace}:${target_os}", [yes:freebsd*], [ # FreeBSD's dtrace requires libelf LIBS="-lelf $LIBS" -fi +]) } { # build section |