nagachika	2017-05-09 23:50:45 +0900 (Tue, 09 May 2017)

  New Revision: 58627

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

  Log:
    merge revision(s) 57490: [Backport #13175]
    
    configure.in: use AC_SEARCH_LIBS
    
    * configure.in (--with-gmp, --with-jemalloc): use AC_SEARCH_LIBS
      to check if no library is required, instead of AC_CHECK_LIB.
      [ruby-core:79368] [Bug #13175]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/configure.in
    branches/ruby_2_4/version.h
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 58626)
+++ ruby_2_4/version.h	(revision 58627)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.2"
 #define RUBY_RELEASE_DATE "2017-05-09"
-#define RUBY_PATCHLEVEL 121
+#define RUBY_PATCHLEVEL 122
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 5
Index: ruby_2_4/configure.in
===================================================================
--- ruby_2_4/configure.in	(revision 58626)
+++ ruby_2_4/configure.in	(revision 58627)
@@ -1386,15 +1386,13 @@ AC_ARG_WITH([gmp], https://github.com/ruby/ruby/blob/trunk/ruby_2_4/configure.in#L1386
 AS_IF([test "x$with_gmp" != xno],
   [AC_CHECK_HEADERS(gmp.h)
    AS_IF([test "x$ac_cv_header_gmp_h" != xno],
-     AC_CHECK_LIB([gmp], [__gmpz_init]))
-   with_gmp="$ac_cv_lib_gmp___gmpz_init"
-   AS_IF([test -z "$with_gmp"], [with_gmp=no])])
+     AC_SEARCH_LIBS([__gmpz_init], [gmp]))])
 
 AC_ARG_WITH([jemalloc],
   [AS_HELP_STRING([--with-jemalloc],[use jemalloc allocator])],
   [with_jemalloc=$withval], [with_jemalloc=no])
 AS_IF([test "x$with_jemalloc" = xyes],[
-  AC_CHECK_LIB([jemalloc], [malloc_conf], [], [with_jemalloc=no])
+  AC_SEARCH_LIBS([malloc_conf], [jemalloc], [], [with_jemalloc=no])
   AC_CHECK_HEADER(jemalloc/jemalloc.h, [
     AC_DEFINE(RUBY_ALTERNATIVE_MALLOC_HEADER, [<jemalloc/jemalloc.h>])
   ])
@@ -4209,12 +4207,6 @@ AS_CASE(["$target_os"], https://github.com/ruby/ruby/blob/trunk/ruby_2_4/configure.in#L4207
 	FIRSTMAKEFILE=GNUmakefile:nacl/GNUmakefile.in
 	])
 
-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: ruby_2_4
===================================================================
--- ruby_2_4	(revision 58626)
+++ ruby_2_4	(revision 58627)

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r57490

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