From: Sascha Schumann <sas@php.net>
Date: Sat, 27 May 2000 19:30:36 +0000 (+0000)
Subject: Solve conflict with mysql's readdir_r check. Both defined HAVE_READDIR_R,
X-Git-Tag: PRE_EIGHT_BYTE_ALLOC_PATCH~223
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2bd6846adc5afb23a1c754211223e0c3f900baec;p=php

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 6d7bf11199..38db9632c9 100644
--- 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([