nobu	2014-12-21 08:35:33 +0900 (Sun, 21 Dec 2014)

  New Revision: 48907

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

  Log:
    configure.in: fix jemalloc option
    
    * configure.in (jemalloc): fix option argument, should use
      `$withval` but not `yes` always.  [ruby-core:66994] [Bug #10625]
    * configure.in (jemalloc): defer adding the liner option to get
      rid of linking contest against jemalloc, so that it works
      without runtime dynamic load path.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
Index: configure.in
===================================================================
--- configure.in	(revision 48906)
+++ configure.in	(revision 48907)
@@ -1204,7 +1204,7 @@ AS_IF([test "x$with_gmp" != xno], https://github.com/ruby/ruby/blob/trunk/configure.in#L1204
 
 AC_ARG_WITH([jemalloc],
   [AS_HELP_STRING([--with-jemalloc],[use jemalloc allocator])],
-  [with_jemalloc=yes], [with_jemalloc=no])
+  [with_jemalloc=$withval], [with_jemalloc=no])
 AS_IF([test "x$with_jemalloc" = xyes],[
   AC_CHECK_LIB([jemalloc], [malloc_conf], [], [with_jemalloc=no])
   AC_CHECK_HEADER(jemalloc/jemalloc.h, [
@@ -1225,7 +1225,6 @@ AS_IF([test "x$with_jemalloc" = xyes],[ https://github.com/ruby/ruby/blob/trunk/configure.in#L1225
   AS_IF([test "x$rb_cv_jemalloc_demangle" = xyes], [
     AC_DEFINE(JEMALLOC_MANGLE)
     with_jemalloc=yes
-    LIBS="-ljemalloc $LIBS"
   ])
   AS_IF([test "x$with_jemalloc" = xyes],
     [
@@ -3769,6 +3768,9 @@ AS_CASE(["$target_os"], https://github.com/ruby/ruby/blob/trunk/configure.in#L3768
 AS_CASE(["$with_gmp: $SOLIBS "], [no:* | *' -lgmp '*|*' $(LIBS) '*], [],
 	[SOLIBS="-lgmp $SOLIBS"])
 
+AS_CASE(["$with_jemalloc: $LIBS "], [no:* | *' -ljemalloc '*], [],
+	[LIBS="-ljemalloc $LIBS"])
+
 MINIOBJS="$MINIDLNOBJ"
 
 AS_CASE(["$THREAD_MODEL"],
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48906)
+++ ChangeLog	(revision 48907)
@@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Dec 21 08:35:26 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (jemalloc): fix option argument, should use
+	  `$withval` but not `yes` always.  [ruby-core:66994] [Bug #10625]
+
+	* configure.in (jemalloc): defer adding the liner option to get
+	  rid of linking contest against jemalloc, so that it works
+	  without runtime dynamic load path.
+
 Sat Dec 20 17:49:03 2014  Tanaka Akira  <akr@f...>
 
 	* lib/tmpdir.rb (Dir.mktmpdir): Accept nil again, as Ruby 2.1.

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