From f658207fe3716bfa6a784c0e857d4579ce03e6b7 Mon Sep 17 00:00:00 2001 From: naruse Date: Mon, 11 Jun 2012 11:27:08 +0000 Subject: [PATCH] * configure.in: on checking libexecinfo, don't specify /use/local. On FreeBSD people must specify --with-opt-dir or --with-execinfo-dir. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36032 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ configure.in | 12 ++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c4f839bbb..941db1de36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jun 11 18:49:52 2012 NARUSE, Yui + + * configure.in: on checking libexecinfo, don't specify /use/local. + On FreeBSD people must specify --with-opt-dir or --with-execinfo-dir. + Mon Jun 11 12:14:37 2012 Koichi Sasada * vm_core.h: remove lfp (local frame pointer) and rename diff --git a/configure.in b/configure.in index 7b2060e1dc..43948fa1ba 100644 --- a/configure.in +++ b/configure.in @@ -2093,17 +2093,9 @@ main(int argc, char *argv[]) fi AS_CASE(["$target_cpu-$target_os"], -[*-freebsd*], [ - AC_CHECK_HEADERS([/usr/local/include/execinfo.h]) - if test "x$ac_cv_header__usr_local_include_execinfo_h" = xyes; then : - RUBY_APPEND_OPTION(CPPFLAGS, -I/usr/local/include) - LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib" - DLDFLAGS="${DLDFLAGS:+$DLDFLAGS }-L/usr/local/lib" - AC_CHECK_LIB([execinfo], [backtrace]) - fi], -[x86_64-netbsd*], [ +[*-freebsd*|x86_64-netbsd*], [ AC_CHECK_HEADERS([execinfo.h]) - if test "x$ac_cv_header_execinfo_h" = xyes; then : + if test "x$ac_cv_header_execinfo_h" = xyes; then AC_CHECK_LIB([execinfo], [backtrace]) fi]) AC_CHECK_FUNCS(backtrace)