Solve conflict with mysql's readdir_r check. Both defined HAVE_READDIR_R,

but with different values.

diff --git a/acinclude.m4 b/acinclude.m4
index 6d7bf111995ce00df291fa51964128d168993731..38db9632c914e057a1610d5b569188c4e5b26728 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -5,7 +5,8 @@ dnl This file contains local autoconf functions.
 sinclude(dynlib.m4)
 
 AC_DEFUN(PHP_READDIR_R_TYPE,[
-  AC_CHECK_FUNCS(readdir_r)
+  dnl HAVE_READDIR_R is also defined by libmysql
+  AC_CHECK_FUNC(readdir_r,ac_cv_func_readdir_r=yes,ac_cv_func_readdir=no)
   if test "$ac_cv_func_readdir_r" = "yes"; then
   AC_CACHE_CHECK(for type of readdir_r, ac_cv_what_readdir_r,[
     AC_TRY_RUN([