com php-src: refactored the mbstring config.w32: ext/mbstring/config.w32

Commit: 42af41162026f3d8dfc86e7afbf860d3605e427a Author: Anatol Belski <ab@php.net> Thu, 27 Nov 2014 13:37:00 +0100 Parents: 3ec8730e891493ea3a91ef19e7d78031cf8bca2e Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=42af41162026f3d8dfc86e7afbf860d3605e427a Log: refactored the mbstring config.w32 Changed paths: M ext/mbstring/config.w32 Diff: diff --git a/ext/mbstring/config.w32 b/ext/mbstring/config.w32 index 487ab1e..cf61436 100644 --- a/ext/mbstring/config.w32 +++ b/ext/mbstring/config.w32 @@ -8,39 +8,30 @@ ARG_ENABLE("mbregex-backtrack", "check multibyte regex backtrack", "yes"); if (PHP_MBSTRING != "no") { + EXTENSION("mbstring", "mbstring.c php_unicode.c mb_gpc.c", PHP_MBSTRING_SHARED); + if (PHP_LIBMBFL != "no" && CHECK_HEADER_ADD_INCLUDE("mbfl/mbfilter.h", "CFLAGS_LIBMBFL", PHP_LIBMBFL + "\\include") && CHECK_LIB("mbfl.lib", "libmbfl", PHP_LIBMBFL + "\\lib")) { - EXTENSION("mbstring", "mbstring.c php_unicode.c mb_gpc.c", PHP_MBSTRING_SHARED, - get_define("CFLAGS_LIBMBFL") + " /I ext/mbstring/oniguruma /D NOT_RUBY=1 \ - /D HAVE_STDARG_PROTOTYPES=1 /D HAVE_STDLIB_H \ - /D HAVE_STRICMP /D EXPORT"); - - STDOUT.WriteLine("LIBS_LIBMBFL:" + get_define("LIBS_LIBMBFL")); - STDOUT.WriteLine("CFLAGS_LIBMBFL:" + get_define("CFLAGS_LIBMBFL")); - STDOUT.WriteLine("LDFLAGS_LIBMBFL:" + get_define("LDFLAGS_LIBMBFL")); ADD_FLAG("LIBS_MBSTRING", get_define("LIBS_LIBMBFL")); ADD_FLAG("LDFLAGS_MBSTRING", get_define("LDFLAGS_LIBMBFL")); - - AC_DEFINE('HAVE_MBSTRING', 1, 'Have mbstring support'); - AC_DEFINE('HAVE_MBSTR_CN', 1, 'CN'); - AC_DEFINE('HAVE_MBSTR_JA', 1, 'JA'); - AC_DEFINE('HAVE_MBSTR_KR', 1, 'KR'); - AC_DEFINE('HAVE_MBSTR_RU', 1, 'RU'); - AC_DEFINE('HAVE_MBSTR_TW', 1, 'TW'); + ADD_FLAG("CFLAGS_MBSTRING", get_define("CFLAGS_LIBMBFL") + + " /I ext/mbstring/oniguruma /D NOT_RUBY=1 \ + /D HAVE_STDARG_PROTOTYPES=1 /D HAVE_STDLIB_H \ + /D HAVE_STRICMP /D EXPORT"); PHP_INSTALL_HEADERS("ext/mbstring", "mbstring.h oniguruma/oniguruma.h php_mbregex.h php_onig_compat.h"); } else { STDOUT.WriteLine("Using bundled libmbfl..."); - FSO.CopyFile("ext\\mbstring\\libmbfl\\config.h.w32", - "ext\\mbstring\\libmbfl\\config.h", true); - EXTENSION("mbstring", "mbstring.c php_unicode.c mb_gpc.c", PHP_MBSTRING_SHARED, - "-Iext/mbstring/libmbfl -Iext/mbstring/libmbfl/mbfl \ + ADD_FLAG("CFLAGS_MBSTRING", "-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 \ - /D HAVE_STRICMP /D MBFL_DLL_EXPORT=1 /D EXPORT"); + /D HAVE_STDARG_PROTOTYPES=1 /D HAVE_CONFIG_H /D HAVE_STDLIB_H \ + /D HAVE_STRICMP /D MBFL_DLL_EXPORT=1 /D EXPORT") + + FSO.CopyFile("ext\\mbstring\\libmbfl\\config.h.w32", + "ext\\mbstring\\libmbfl\\config.h", true); ADD_SOURCES("ext/mbstring/libmbfl/filters", "html_entities.c \ mbfilter_7bit.c mbfilter_ascii.c mbfilter_base64.c mbfilter_big5.c \ @@ -73,15 +64,16 @@ if (PHP_MBSTRING != "no") { nls_kr.c nls_neutral.c nls_ru.c nls_uni.c nls_zh.c nls_hy.c \ nls_ua.c nls_tr.c", "mbstring"); - AC_DEFINE('HAVE_MBSTRING', 1, 'Have mbstring support'); - AC_DEFINE('HAVE_MBSTR_CN', 1, 'CN'); - AC_DEFINE('HAVE_MBSTR_JA', 1, 'JA'); - AC_DEFINE('HAVE_MBSTR_KR', 1, 'KR'); - AC_DEFINE('HAVE_MBSTR_RU', 1, 'RU'); - AC_DEFINE('HAVE_MBSTR_TW', 1, 'TW'); - PHP_INSTALL_HEADERS("ext/mbstring", "mbstring.h oniguruma/oniguruma.h php_mbregex.h php_onig_compat.h libmbfl/config..h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_allocators.h libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_ident.h libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h"); } + + AC_DEFINE('HAVE_MBSTRING', 1, 'Have mbstring support'); + AC_DEFINE('HAVE_MBSTR_CN', 1, 'CN'); + AC_DEFINE('HAVE_MBSTR_JA', 1, 'JA'); + AC_DEFINE('HAVE_MBSTR_KR', 1, 'KR'); + AC_DEFINE('HAVE_MBSTR_RU', 1, 'RU'); + AC_DEFINE('HAVE_MBSTR_TW', 1, 'TW'); + FSO.CopyFile("ext\\mbstring\\oniguruma\\win32\\config.h", "ext\\mbstring\\oniguruma\\config.h", true);