cvs: php4 / acinclude.m4
| From: | Sascha Schumann | Date: | Sat, 27 May 2000 19:30:36 +0000 |
| Subject: | cvs: php4 / acinclude.m4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-15838@lists.php.net to get a copy of this message | ||
sas Sat May 27 12:30:36 2000 EDT
Modified files:
/php4 acinclude.m4
Log:
Solve conflict with mysql's readdir_r check. Both defined HAVE_READDIR_R,
but with different values.
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.89 php4/acinclude.m4:1.90
--- php4/acinclude.m4:1.89 Wed May 24 04:06:57 2000
+++ php4/acinclude.m4 Sat May 27 12:30:36 2000
@@ -1,11 +1,12 @@
-dnl $Id: acinclude.m4,v 1.89 2000/05/24 11:06:57 sas Exp $
+dnl $Id: acinclude.m4,v 1.90 2000/05/27 19:30:36 sas Exp $
dnl
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([