Remove leftovers

diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4
index 3c68accd144d5b4fc2aad320cb0165f4ddae6d22..4e71f1befe7bc08f3a5b5e9f86b72c9e9003a8a5 100644 (file)
--- a/ext/mbstring/config.m4
+++ b/ext/mbstring/config.m4
@@ -211,22 +211,6 @@ PHP_ARG_WITH(libmbfl, [for external libmbfl],
 if test "$PHP_MBSTRING" != "no"; then  
   AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support])
 
-  if test "$PHP_MBSTRING" = "all" -o "$PHP_MBSTRING" = "ja"; then
-    AC_DEFINE([HAVE_MBSTR_JA],1,[whether to have japanese support])
-  fi
-  if test "$PHP_MBSTRING" = "all" -o "$PHP_MBSTRING" = "cn"; then
-    AC_DEFINE([HAVE_MBSTR_CN],1,[whether to have simplified chinese support])
-  fi
-  if test "$PHP_MBSTRING" = "all" -o "$PHP_MBSTRING" = "tw"; then
-    AC_DEFINE([HAVE_MBSTR_TW],1,[whether to have traditional chinese support])
-  fi
-  if test "$PHP_MBSTRING" = "all" -o "$PHP_MBSTIRNG" = "kr"; then
-    AC_DEFINE([HAVE_MBSTR_KR],1,[whether to have korean support])
-  fi
-  if test "$PHP_MBSTRING" = "all" -o "$PHP_MBSTRING" = "ru"; then
-    AC_DEFINE([HAVE_MBSTR_RU],1,[whether to have russian support])
-  fi
-       
   PHP_MBSTRING_ADD_SOURCES([mbstring.c php_unicode.c mb_gpc.c])
 
   if test "$PHP_MBREGEX" != "no"; then

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index a7ae46c41b2394eab3acd873d0ac9cc2e8eb4e7e..a949edf5f45a9c67f1fe5ab1728a93734bf1881d 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -977,21 +977,6 @@ PHP_MINFO_FUNCTION(mbstring)
        php_info_print_table_start();
        php_info_print_table_row(2, "Multibyte Support", "enabled");
        php_info_print_table_row(2, "Multibyte string engine", "libmbfl");
-#if defined(HAVE_MBSTR_JA)
-       php_info_print_table_row(2, "Japanese support", "enabled");     
-#endif
-#if defined(HAVE_MBSTR_CN)
-       php_info_print_table_row(2, "Simplified chinese support", "enabled");   
-#endif
-#if defined(HAVE_MBSTR_TW)
-       php_info_print_table_row(2, "Traditional chinese support", "enabled");  
-#endif
-#if defined(HAVE_MBSTR_KR)
-       php_info_print_table_row(2, "Korean support", "enabled");       
-#endif
-#if defined(HAVE_MBSTR_RU)
-       php_info_print_table_row(2, "Russian support", "enabled");      
-#endif
        if (MBSTRG(encoding_translation)) {
                php_info_print_table_row(2, "HTTP input encoding translation", "enabled");      
        }