mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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/trunk@57490 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
c2310e8598
commit
a106278e54
1 changed files with 2 additions and 10 deletions
12
configure.in
12
configure.in
|
@ -1353,15 +1353,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>])
|
||||
])
|
||||
|
@ -4176,12 +4174,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"],
|
||||
|
|
Loading…
Reference in a new issue