MFH: it'd be a bad idea to make subpackages dependent on the php build system.

diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4
index af51b8190981c8d93825c1e64bbf55084202f26d..b88ea2f33cb295c9eff4ea04a0967e91e8e11d0a 100644 (file)
--- a/ext/mbstring/config.m4
+++ b/ext/mbstring/config.m4
@@ -34,7 +34,7 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [
     PHP_ADD_BUILD_DIR([$ext_builddir/$dir])
   done
   
-  if test "$ext_shared" = "no"; then
+  if test "$ext_shared" = "no" -o ! -e "$ext_builddir/config.h.in"; then
     out="php_config.h"
   else
     out="$abs_builddir/config.h"

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c
index cc13d1544c27658452efb9ac343530cb826546c1..be9d345b06166914ea97c21859b93ebcfb949c45 100644 (file)
--- a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c
@@ -28,8 +28,6 @@
  *
  */
 
-#include "php.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
index a63ea370c47d068eb8a148ad5be4c00f5355a814..7f0dc9ab603438cab08d6080fd4a07704682014a 100644 (file)
--- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
@@ -28,8 +28,6 @@
  *
  */
 
-#include "php.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_language.c b/ext/mbstring/libmbfl/mbfl/mbfl_language.c
index 5f55a45e234a92674a527bc5b51f8c474b6df404..be1341ab8c40deb62be4fdd42423efe52100fe39 100644 (file)
--- a/ext/mbstring/libmbfl/mbfl/mbfl_language.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_language.c
@@ -28,8 +28,6 @@
  *
  */
 
-#include "php.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif