Refactor ext/mbstring/libmbfl/config.h usage

.github/labeler.yml

@@ -443,7 +443,6 @@
       - 'ext/json/php_json_parser.h'
       - 'ext/json/php_json_scanner.h'
       - 'ext/libxml/php_libxml.h'
-      - 'ext/mbstring/libmbfl/config.h'
       - 'ext/mbstring/libmbfl/mbfl/eaw_table.h'
       - 'ext/mbstring/libmbfl/mbfl/mbfilter.h'
       - 'ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h'

configure.ac

@@ -389,7 +389,6 @@ AC_CHECK_HEADERS(m4_normalize([
   pty.h
   pwd.h
   resolv.h
-  strings.h
   syslog.h
   sysexits.h
   sys/ioctl.h
@@ -587,7 +586,6 @@ AC_CHECK_FUNCS(m4_normalize([
   statfs
   statvfs
   std_syslog
-  strcasecmp
   strptime
   strtok_r
   symlink

ext/mbstring/config.m4

@@ -52,10 +52,15 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [
   PHP_INSTALL_HEADERS([ext/mbstring], [php_mbregex.h php_onig_compat.h])
 ])
 
+dnl
+dnl PHP_MBSTRING_SETUP_LIBMBFL
+dnl
+dnl Configure bundled libmbfl. It is required and cannot be disabled.
+dnl
 AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [
-  dnl
-  dnl Bundled libmbfl is required and can not be disabled
-  dnl
+  AC_CHECK_HEADERS([strings.h])
+  AC_CHECK_FUNCS([strcasecmp])
+
   PHP_MBSTRING_ADD_BUILD_DIR([libmbfl])
   PHP_MBSTRING_ADD_BUILD_DIR([libmbfl/mbfl])
   PHP_MBSTRING_ADD_BUILD_DIR([libmbfl/filters])
@@ -103,7 +108,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [
   ])
 
   PHP_INSTALL_HEADERS([ext/mbstring], m4_normalize([
-    libmbfl/config.h
     libmbfl/mbfl/eaw_table.h
     libmbfl/mbfl/mbfilter_8bit.h
     libmbfl/mbfl/mbfilter_pass.h
@@ -144,7 +148,6 @@ if test "$PHP_MBSTRING" != "no"; then
 
   AS_VAR_IF([PHP_MBREGEX], [yes], [PHP_MBSTRING_SETUP_MBREGEX])
 
-  dnl libmbfl is required
   PHP_MBSTRING_SETUP_LIBMBFL
 
   PHP_NEW_EXTENSION([mbstring],
@@ -159,18 +162,15 @@ if test "$PHP_MBSTRING" != "no"; then
   done
 
   for dir in $PHP_MBSTRING_EXTRA_INCLUDES; do
-    PHP_ADD_INCLUDE([$ext_srcdir/$dir])
     PHP_ADD_INCLUDE([$ext_builddir/$dir])
+    PHP_ADD_INCLUDE([$ext_srcdir/$dir])
   done
 
-  out="php_config.h"
-
-  if test "$ext_shared" != "no" && test -f "$ext_builddir/config.h.in"; then
-    out="$abs_builddir/config.h"
-  fi
-
   cat > $ext_builddir/libmbfl/config.h <<EOF
-#include "$out"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <php_config.h>
 EOF
 
   PHP_INSTALL_HEADERS([ext/mbstring], [mbstring.h])

ext/mbstring/config.w32

@@ -12,12 +12,15 @@ if (PHP_MBSTRING != "no") {
 		STDOUT.WriteLine("Using bundled libmbfl...");
 
 		ADD_FLAG("CFLAGS_MBSTRING", "-Iext/mbstring -Iext/mbstring/libmbfl -Iext/mbstring/libmbfl/mbfl \
-			/D HAVE_STRICMP /D MBFL_DLL_EXPORT=1 /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1")
+			/D MBFL_DLL_EXPORT=1 /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1")
 
 		ADD_FLAG("CFLAGS_BD_EXT_MBSTRING", "/utf-8")
 
-		FSO.CopyFile("ext\\mbstring\\libmbfl\\config.h.w32",
-			"ext\\mbstring\\libmbfl\\config.h", true);
+		var mbfl_config = FSO.CreateTextFile("ext/mbstring/libmbfl/config.h", true);
+		mbfl_config.WriteLine("#define HAVE_STRCASECMP 1");
+		mbfl_config.WriteLine("#define HAVE_STRICMP 1");
+		mbfl_config.WriteLine("#include <config.w32.h>");
+		mbfl_config.Close();
 
 		ADD_SOURCES("ext/mbstring/libmbfl/filters", "html_entities.c \
 			mbfilter_7bit.c mbfilter_base64.c \
@@ -37,7 +40,7 @@ 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");
 
-		PHP_INSTALL_HEADERS("ext/mbstring", "mbstring.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_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_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h");
+		PHP_INSTALL_HEADERS("ext/mbstring", "mbstring.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_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_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h");
 
 		AC_DEFINE('HAVE_MBSTRING', 1, "Define to 1 if the PHP extension 'mbstring' is available.");
 

ext/mbstring/libmbfl/mbfl/mbfl_encoding.c

@@ -28,7 +28,7 @@
  *
  */
 
-#include "libmbfl/config.h"
+#include <libmbfl/config.h>
 
 #ifdef HAVE_STRINGS_H
 	/* For strncasecmp */

ext/mbstring/libmbfl/mbfl/mbfl_language.c

@@ -28,7 +28,7 @@
  *
  */
 
-#include "libmbfl/config.h"
+#include <libmbfl/config.h>
 
 #include <stddef.h>
 #include <string.h>

ext/mbstring/mbstring.c

@@ -20,7 +20,7 @@
 /* {{{ includes */
 #include <limits.h>
 
-#include "libmbfl/config.h"
+#include <libmbfl/config.h>
 #include "php.h"
 #include "php_ini.h"
 #include "php_variables.h"

ext/mbstring/php_mbregex.c

@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
  */
 
-#include "libmbfl/config.h"
+#include <libmbfl/config.h>
 
 #include "php.h"
 #include "php_ini.h"

win32/build/config.w32.h.in

@@ -58,7 +58,6 @@
 #undef HAVE_STRUCT_STAT_ST_BLOCKS
 #define HAVE_STRUCT_STAT_ST_RDEV 1
 #define HAVE_SHUTDOWN 1
-#define HAVE_STRCASECMP 1
 #define HAVE_UTIME 1
 #undef HAVE_DIRENT_H
 #define HAVE_FCNTL_H 1