diff options
| author | glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-12 15:17:13 +0000 |
|---|---|---|
| committer | glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-12 15:17:13 +0000 |
| commit | d6203c933e2630a9f604bc14b32cfd17cf0c9ed1 (patch) | |
| tree | efb47954bfa5fea5b745d9391aea410969a8130c /configure.in | |
| parent | 14922c70332c954a8d8a7fe32bf1384790be3e26 (diff) | |
* configure.in: fix to undefine HAVE_MEMEM collectlly if it is broken.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 6baa495bed..3dbbf65e13 100644 --- a/configure.in +++ b/configure.in @@ -1918,6 +1918,7 @@ AC_CHECK_FUNCS(mblen) AC_CHECK_FUNCS(memalign) AC_CHECK_FUNCS(writev) AC_CHECK_FUNCS(memrchr) +AC_CHECK_FUNCS(memmem) AC_CHECK_FUNCS(mktime) AC_CHECK_FUNCS(pipe2) AC_CHECK_FUNCS(poll) @@ -3586,7 +3587,7 @@ if test "${universal_binary-no}" = yes ; then ])]) fi -AC_CHECK_FUNC(memmem, [ +if test "$ac_cv_func_memmem" = yes; then AC_CACHE_CHECK(for broken memmem, rb_cv_broken_memmem, [ AC_TRY_RUN([ #include <string.h> @@ -3616,10 +3617,8 @@ main() rb_cv_broken_memmem=yes, rb_cv_broken_memmem=yes) ]) - if test "$rb_cv_broken_memmem" = no; then - AC_DEFINE(HAVE_MEMMEM, 1) - fi -]) + AS_CASE([$ac_cv_func_memmem],[yes],[ac_cv_func_memmem=no]) +fi CPPFLAGS="$CPPFLAGS "'$(DEFS)' |