summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2000-05-27 19:30:36 +0000
committerSascha Schumann <sas@php.net>2000-05-27 19:30:36 +0000
commit2bd6846adc5afb23a1c754211223e0c3f900baec (patch)
treebc4cb7d737ce43212b1a50498c4d2095ab59ff39 /acinclude.m4
parentfb39eda0d80f0b45cbdf17c9b898298f90f4812b (diff)
downloadphp-git-2bd6846adc5afb23a1c754211223e0c3f900baec.tar.gz
Solve conflict with mysql's readdir_r check. Both defined HAVE_READDIR_R,
but with different values.
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m43
1 files changed, 2 insertions, 1 deletions
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([