glass	2014-02-13 00:17:13 +0900 (Thu, 13 Feb 2014)

  New Revision: 44920

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44920

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

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
Index: configure.in
===================================================================
--- configure.in	(revision 44919)
+++ configure.in	(revision 44920)
@@ -1918,6 +1918,7 @@ AC_CHECK_FUNCS(mblen) https://github.com/ruby/ruby/blob/trunk/configure.in#L1918
 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 ; https://github.com/ruby/ruby/blob/trunk/configure.in#L3587
     ])])
 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() https://github.com/ruby/ruby/blob/trunk/configure.in#L3617
     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)'
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 44919)
+++ ChangeLog	(revision 44920)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Feb 13 00:15:10 2014  Masaki Matsushita  <glass.saga@g...>
+
+	* configure.in: fix to undefine HAVE_MEMEM collectlly if it is broken.
+
 Tue Feb 11 23:54:40 2014  Tanaka Akira  <akr@f...>
 
 	* bignum.c (rb_big_cmp): Specialize a comparison to zero.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/