diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-14 22:22:39 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-14 22:22:39 +0000 |
| commit | edda79257537a37a679b7c3a066243ff4123b0d5 (patch) | |
| tree | 62d14654c08c80e8ee16f7a5805a0cface38d85f /configure.in | |
| parent | ac74cb6b1af10d42eb5aa9b80b15db1836d0cd15 (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 6d714f3b24..bb7cc4daa5 100644 --- a/configure.in +++ b/configure.in @@ -1403,13 +1403,15 @@ AC_ARG_WITH([gmp], 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>]) ]) |