diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-09 14:50:45 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-09 14:50:45 +0000 |
| commit | 97da0db77692cf557efbedd95670592e84bd82cc (patch) | |
| tree | ac415d0eead705a5bf5cbda2c479cfff69ac0c5c /configure.in | |
| parent | 33b90a28e5ebd454c49ba206f0f95dc2ee18116f (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@58627 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/configure.in b/configure.in index 8a6662e06a..742153b349 100644 --- a/configure.in +++ b/configure.in @@ -1386,15 +1386,13 @@ 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_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"], 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"], |