1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* configure.in: fix to undefine HAVE_MEMEM collectlly if it is broken.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
glass 2014-02-12 15:17:13 +00:00
parent 14922c7033
commit d6203c933e
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Feb 13 00:15:10 2014 Masaki Matsushita <glass.saga@gmail.com>
* configure.in: fix to undefine HAVE_MEMEM collectlly if it is broken.
Tue Feb 11 23:54:40 2014 Tanaka Akira <akr@fsij.org> Tue Feb 11 23:54:40 2014 Tanaka Akira <akr@fsij.org>
* bignum.c (rb_big_cmp): Specialize a comparison to zero. * bignum.c (rb_big_cmp): Specialize a comparison to zero.

9
configure.in
View File

@ -1918,6 +1918,7 @@ AC_CHECK_FUNCS(mblen)
AC_CHECK_FUNCS(memalign) AC_CHECK_FUNCS(memalign)
AC_CHECK_FUNCS(writev) AC_CHECK_FUNCS(writev)
AC_CHECK_FUNCS(memrchr) AC_CHECK_FUNCS(memrchr)
AC_CHECK_FUNCS(memmem)
AC_CHECK_FUNCS(mktime) AC_CHECK_FUNCS(mktime)
AC_CHECK_FUNCS(pipe2) AC_CHECK_FUNCS(pipe2)
AC_CHECK_FUNCS(poll) AC_CHECK_FUNCS(poll)
@ -3586,7 +3587,7 @@ if test "${universal_binary-no}" = yes ; then
])]) ])])
fi fi
AC_CHECK_FUNC(memmem, [ if test "$ac_cv_func_memmem" = yes; then
AC_CACHE_CHECK(for broken memmem, rb_cv_broken_memmem, [ AC_CACHE_CHECK(for broken memmem, rb_cv_broken_memmem, [
AC_TRY_RUN([ AC_TRY_RUN([
#include <string.h> #include <string.h>
@ -3616,10 +3617,8 @@ main()
rb_cv_broken_memmem=yes, rb_cv_broken_memmem=yes,
rb_cv_broken_memmem=yes) rb_cv_broken_memmem=yes)
]) ])
if test "$rb_cv_broken_memmem" = no; then AS_CASE([$ac_cv_func_memmem],[yes],[ac_cv_func_memmem=no])
AC_DEFINE(HAVE_MEMMEM, 1) fi
fi
])
CPPFLAGS="$CPPFLAGS "'$(DEFS)' CPPFLAGS="$CPPFLAGS "'$(DEFS)'