Refactor ext/mbstring/libmbfl/config.h usage

This simplifies the libmbfl/config.h usage and removes duplicate compile
definitions on Windows (HAVE_STRICMP).

The _WIN32 symbol is always defined when compiling on Windows with any
current compiler, the HAVE_CONFIG_H symbol is defined only when doing
phpize build inside mbstring extension (an edge case but if that is used
by someone perhaps), otherwise the regular main/php_config.h is used.

Author: petk

.gitignore

@@ -294,5 +294,6 @@ tmp-php.ini
 !/ext/fileinfo/libmagic.patch
 !/ext/fileinfo/magicdata.patch
 !/ext/dom/lexbor/patches/*.patch
+!/ext/mbstring/libmbfl/config.h
 !/ext/pcre/pcre2lib/config.h
 !/win32/build/Makefile

ext/mbstring/config.m4

@@ -35,16 +35,6 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [
     PHP_ADD_INCLUDE([$ext_builddir/$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"
-EOF
-
   PHP_MBSTRING_ADD_INSTALL_HEADERS([mbstring.h])
   PHP_INSTALL_HEADERS([ext/mbstring], [$PHP_MBSTRING_INSTALL_HEADERS])
 ])

ext/mbstring/config.w32

@@ -11,10 +11,7 @@ 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")
-
-		FSO.CopyFile("ext\\mbstring\\libmbfl\\config.h.w32",
-			"ext\\mbstring\\libmbfl\\config.h", true);
+			/D MBFL_DLL_EXPORT=1 /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1")
 
 		ADD_SOURCES("ext/mbstring/libmbfl/filters", "html_entities.c \
 			mbfilter_7bit.c mbfilter_base64.c \

ext/mbstring/libmbfl/config.h

@@ -0,0 +1,7 @@
+#ifdef _WIN32
+# define HAVE_STRICMP 1
+#elif defined(HAVE_CONFIG_H)
+# include <config.h>
+#else
+# include <main/php_config.h>
+#endif