[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring config.w32

2009-06-12 Thread Kalle Sommer Nielsen 
kalle   Fri Jun 12 16:15:51 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mbstring   config.w32 
  Log:
  MFH: Fixed static build of mbstring on Windows (makes static build of exif 
possible too)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.w32?r1=1.10.2.1.2.4.2.4r2=1.10.2.1.2.4.2.5diff_format=u
Index: php-src/ext/mbstring/config.w32
diff -u php-src/ext/mbstring/config.w32:1.10.2.1.2.4.2.4 
php-src/ext/mbstring/config.w32:1.10.2.1.2.4.2.5
--- php-src/ext/mbstring/config.w32:1.10.2.1.2.4.2.4Fri Mar 20 18:42:02 2009
+++ php-src/ext/mbstring/config.w32 Fri Jun 12 16:15:51 2009
@@ -1,18 +1,18 @@
-// $Id: config.w32,v 1.10.2.1.2.4.2.4 2009/03/20 18:42:02 pajoye Exp $
+// $Id: config.w32,v 1.10.2.1.2.4.2.5 2009/06/12 16:15:51 kalle Exp $
 // vim:ft=javascript
 
 ARG_ENABLE(mbstring, multibyte string functions, no);
 ARG_ENABLE(mbregex, multibyte regex support, no);
 ARG_ENABLE(mbregex-backtrack, check multibyte regex backtrack, yes);
 
-if (PHP_MBSTRING == yes) {
+if (PHP_MBSTRING != no) {
 
FSO.CopyFile(ext\\mbstring\\libmbfl\\config.h.vc6,
ext\\mbstring\\libmbfl\\config.h, true);
FSO.CopyFile(ext\\mbstring\\oniguruma\\win32\\config.h,
ext\\mbstring\\oniguruma\\config.h, true);

-   EXTENSION(mbstring, mbstring.c php_unicode.c mb_gpc.c, true,
+   EXTENSION(mbstring, mbstring.c php_unicode.c mb_gpc.c, 
PHP_MBSTRING_SHARED,
-Iext/mbstring/libmbfl -Iext/mbstring/libmbfl/mbfl \
-Iext/mbstring/oniguruma /D NOT_RUBY=1 /D LIBMBFL_EXPORTS=1 \
/D HAVE_STDARG_PROTOTYPES=1 /D HAVE_CONFIG_H /D HAVE_STDLIB_H \



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring config.w32

2009-03-20 Thread Pierre-Alain Joye 
pajoye  Fri Mar 20 18:42:02 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mbstring   config.w32 
  Log:
  - fix build, add new cp850 file
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.w32?r1=1.10.2.1.2.4.2.3r2=1.10.2.1.2.4.2.4diff_format=u
Index: php-src/ext/mbstring/config.w32
diff -u php-src/ext/mbstring/config.w32:1.10.2.1.2.4.2.3 
php-src/ext/mbstring/config.w32:1.10.2.1.2.4.2.4
--- php-src/ext/mbstring/config.w32:1.10.2.1.2.4.2.3Wed Jul 30 09:26:15 2008
+++ php-src/ext/mbstring/config.w32 Fri Mar 20 18:42:02 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.10.2.1.2.4.2.3 2008/07/30 09:26:15 pajoye Exp $
+// $Id: config.w32,v 1.10.2.1.2.4.2.4 2009/03/20 18:42:02 pajoye Exp $
 // vim:ft=javascript
 
 ARG_ENABLE(mbstring, multibyte string functions, no);
@@ -34,7 +34,7 @@
mbfilter_ucs4.c mbfilter_uhc.c mbfilter_utf16.c 
mbfilter_utf32.c \
mbfilter_utf7.c mbfilter_utf7imap.c mbfilter_utf8.c \
mbfilter_koi8u.c mbfilter_cp1254.c \
-   mbfilter_uuencode.c mbfilter_armscii8.c, mbstring);
+   mbfilter_uuencode.c mbfilter_armscii8.c mbfilter_cp850.c , 
mbstring);
 
ADD_SOURCES(ext/mbstring/libmbfl/mbfl, mbfilter.c mbfilter_8bit.c \
mbfilter_pass.c mbfilter_wchar.c mbfl_convert.c mbfl_encoding.c 
\



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring config.w32

2008-07-30 Thread Pierre-Alain Joye 
pajoye  Wed Jul 30 09:26:15 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mbstring   config.w32 
  Log:
  - mbstring is built shared on windows
it looks like the idea was to have it static (but does not work)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.w32?r1=1.10.2.1.2.4.2.2r2=1.10.2.1.2.4.2.3diff_format=u
Index: php-src/ext/mbstring/config.w32
diff -u php-src/ext/mbstring/config.w32:1.10.2.1.2.4.2.2 
php-src/ext/mbstring/config.w32:1.10.2.1.2.4.2.3
--- php-src/ext/mbstring/config.w32:1.10.2.1.2.4.2.2Thu Jul 24 17:00:03 2008
+++ php-src/ext/mbstring/config.w32 Wed Jul 30 09:26:15 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.10.2.1.2.4.2.2 2008/07/24 17:00:03 moriyoshi Exp $
+// $Id: config.w32,v 1.10.2.1.2.4.2.3 2008/07/30 09:26:15 pajoye Exp $
 // vim:ft=javascript
 
 ARG_ENABLE(mbstring, multibyte string functions, no);
@@ -12,7 +12,7 @@
FSO.CopyFile(ext\\mbstring\\oniguruma\\win32\\config.h,
ext\\mbstring\\oniguruma\\config.h, true);

-   EXTENSION(mbstring, mbstring.c php_unicode.c mb_gpc.c, null,
+   EXTENSION(mbstring, mbstring.c php_unicode.c mb_gpc.c, true,
-Iext/mbstring/libmbfl -Iext/mbstring/libmbfl/mbfl \
-Iext/mbstring/oniguruma /D NOT_RUBY=1 /D LIBMBFL_EXPORTS=1 \
/D HAVE_STDARG_PROTOTYPES=1 /D HAVE_CONFIG_H /D HAVE_STDLIB_H \



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring config.w32

2008-07-24 Thread Moriyoshi Koizumi 
moriyoshi   Thu Jul 24 17:00:03 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mbstring   config.w32 
  Log:
  - MFH: fix win32 build
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.w32?r1=1.10.2.1.2.4.2.1r2=1.10.2.1.2.4.2.2diff_format=u
Index: php-src/ext/mbstring/config.w32
diff -u php-src/ext/mbstring/config.w32:1.10.2.1.2.4.2.1 
php-src/ext/mbstring/config.w32:1.10.2.1.2.4.2.2
--- php-src/ext/mbstring/config.w32:1.10.2.1.2.4.2.1Sat Jul  5 06:52:03 2008
+++ php-src/ext/mbstring/config.w32 Thu Jul 24 17:00:03 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.10.2.1.2.4.2.1 2008/07/05 06:52:03 hirokawa Exp $
+// $Id: config.w32,v 1.10.2.1.2.4.2.2 2008/07/24 17:00:03 moriyoshi Exp $
 // vim:ft=javascript
 
 ARG_ENABLE(mbstring, multibyte string functions, no);
@@ -55,6 +55,7 @@
if (PHP_MBREGEX != no) {
AC_DEFINE('HAVE_STDARG_PROTOTYPES', 1, 'have stdarg.h');
AC_DEFINE('HAVE_MBREGEX', 1);
+   AC_DEFINE('HAVE_ONIG', 1);
if (PHP_MBREGEX_BACKTRACK != no) {
AC_DEFINE('USE_COMBINATION_EXPLOSION_CHECK', 1);
}



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php