diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-04-30 13:35:33 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-04-30 13:35:33 +0000 |
commit | bf34bdf5c29d2e3d6a829e102ca11ebbe9ae5d91 (patch) | |
tree | fb467c4e7bbb1cf999f5f2d1f753a731fedbfd29 /configure.in | |
parent | 2dfde7e8586cf35318b6053410dba74fe9f06f8d (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_3@58515 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 0a2e78f0e1..df003c72b0 100644 --- a/configure.in +++ b/configure.in @@ -1319,15 +1319,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>]) ]) @@ -4045,12 +4043,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"], |