moriyoshi Thu Dec 4 17:50:55 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring config.m4
/php-src/ext/mbstring/libmbfl/mbfl mbfl_allocators.c
mbfl_encoding.c mbfl_language.c
Log:
MFH: it'd be a bad idea to make subpackages dependent on the php build system.
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.28.2.5 php-src/ext/mbstring/config.m4:1.28.2.6
--- php-src/ext/mbstring/config.m4:1.28.2.5 Mon Oct 27 12:50:07 2003
+++ php-src/ext/mbstring/config.m4 Thu Dec 4 17:50:54 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.28.2.5 2003/10/27 17:50:07 moriyoshi Exp $
+dnl $Id: config.m4,v 1.28.2.6 2003/12/04 22:50:54 moriyoshi Exp $
dnl
AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -34,7 +34,7 @@
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"
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c:1.4.2.1
php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c:1.4.2.2
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c:1.4.2.1 Sat Oct 25 07:58:44
2003
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c Thu Dec 4 17:50:54 2003
@@ -28,8 +28,6 @@
*
*/
-#include "php.h"
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.4.2.1
php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.4.2.2
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.4.2.1 Sat Oct 25 07:58:44
2003
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c Thu Dec 4 17:50:54 2003
@@ -28,8 +28,6 @@
*
*/
-#include "php.h"
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c:1.4.2.1
php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c:1.4.2.2
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c:1.4.2.1 Sat Oct 25 07:58:44
2003
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c Thu Dec 4 17:50:54 2003
@@ -28,8 +28,6 @@
*
*/
-#include "php.h"
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
