diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 12 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 11 insertions, 11 deletions
@@ -1,3 +1,11 @@ +Sun Apr 30 22:35:10 2017 Nobuyoshi Nakada <nobu@ruby-lang.org> + + 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] + Sun Apr 30 22:24:25 2017 Nobuyoshi Nakada <nobu@ruby-lang.org> * numeric.c (flo_round): [EXPERIMENTAL] adjust the case that the 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"], @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.5" #define RUBY_RELEASE_DATE "2017-04-30" -#define RUBY_PATCHLEVEL 304 +#define RUBY_PATCHLEVEL 305 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 4 |