Index: acconfig.h.in =================================================================== RCS file: /repository/php4/acconfig.h.in,v retrieving revision 1.38 diff -u -r1.38 acconfig.h.in --- acconfig.h.in 2000/06/08 06:14:58 1.38 +++ acconfig.h.in 2000/09/11 15:40:09 @@ -1 +1,5 @@ /* Leave this file alone */ +#if PHP_READDIR_R_NULL_BUG +#undef HAVE_POSIX_READDIR_R +#endif + Index: acinclude.m4 =================================================================== RCS file: /repository/php4/acinclude.m4,v retrieving revision 1.102 diff -u -r1.102 acinclude.m4 --- acinclude.m4 2000/07/26 14:53:54 1.102 +++ acinclude.m4 2000/09/11 15:40:11 @@ -88,6 +88,39 @@ fi ]) +AC_DEFUN(PHP_READDIR_R_CHECK_BROKEN,[ + AC_CACHE_CHECK(whether readdir_r is broken, ac_cv_broken_readdir_r,[ + AC_TRY_RUN([ +#define _REENTRANT +#include +#include + +main() { + DIR *dir; + struct dirent entry, *pentry=0; + + dir = opendir("/"); + if (!dir) + exit(1); + if (readdir_r(dir, &entry, &pentry) == 0) + exit(0); + exit(1); +} +],[ + ac_cv_broken_readdir_r=no + ],[ + ac_cv_broken_readdir_r=yes + ],[ + ac_cv_broken_readdir_r=no + ]) + ]) + if test "$ac_cv_broken_readdir_r" = "yes"; then + AC_DEFINE(PHP_READDIR_R_NULL_BUG, 1, [ ]) + else + AC_DEFINE(PHP_READDIR_R_NULL_BUG, 0, [ ]) + fi +]) + AC_DEFUN(PHP_SHLIB_SUFFIX_NAME,[ PHP_SUBST(SHLIB_SUFFIX_NAME) SHLIB_SUFFIX_NAME=so Index: configure.in =================================================================== RCS file: /repository/php4/configure.in,v retrieving revision 1.181 diff -u -r1.181 configure.in --- configure.in 2000/09/10 09:35:48 1.181 +++ configure.in 2000/09/11 15:40:13 @@ -409,6 +409,7 @@ PHP_DECLARED_TIMEZONE PHP_TIME_R_TYPE PHP_READDIR_R_TYPE +PHP_READDIR_R_CHECK_BROKEN dnl AIX keeps in_addr_t in /usr/include/netinet/in.h dnl AC_MSG_CHECKING(for in_addr_t)