nagachika	2017-09-15 07:22:39 +0900 (Fri, 15 Sep 2017)

  New Revision: 59914

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

  Log:
    merge revision(s) 58254: [Backport #13402]
    
    fix --with-gmp (broken by r57490)
    
    Looking at the generated shell script (also the autoconf manual), it
    seems AC_SEARCH_LIBS() m4 macro does not define HAVE_LIBsomething C
    preprocessor macros, unlike AC_CHECK_LIB() which does define them.
    This previous change effectively killed building with GMP because
    building that mode depends on existence of HAVE_LIBGMP. [Bug #13402]

  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 59913)
+++ ruby_2_4/version.h	(revision 59914)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.3"
 #define RUBY_RELEASE_DATE "2017-09-15"
-#define RUBY_PATCHLEVEL 199
+#define RUBY_PATCHLEVEL 200
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 9
Index: ruby_2_4/configure.in
===================================================================
--- ruby_2_4/configure.in	(revision 59913)
+++ ruby_2_4/configure.in	(revision 59914)
@@ -1403,13 +1403,15 @@ AC_ARG_WITH([gmp], https://github.com/ruby/ruby/blob/trunk/ruby_2_4/configure.in#L1403
 AS_IF([test "x$with_gmp" != xno],
   [AC_CHECK_HEADERS(gmp.h)
    AS_IF([test "x$ac_cv_header_gmp_h" != xno],
-     AC_SEARCH_LIBS([__gmpz_init], [gmp]))])
+     AC_SEARCH_LIBS([__gmpz_init], [gmp],
+       [AC_DEFINE(HAVE_LIBGMP, 1)]))])
 
 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_SEARCH_LIBS([malloc_conf], [jemalloc], [], [with_jemalloc=no])
+  AC_SEARCH_LIBS([malloc_conf], [jemalloc],
+    [AC_DEFINE(HAVE_LIBJEMALLOC, 1)], [with_jemalloc=no])
   AC_CHECK_HEADER(jemalloc/jemalloc.h, [
     AC_DEFINE(RUBY_ALTERNATIVE_MALLOC_HEADER, [<jemalloc/jemalloc.h>])
   ])
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 59913)
+++ ruby_2_4	(revision 59914)

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

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