Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

patches/8.3/php-config.patch

@@ -59,7 +59,7 @@ index 142ddf08fd9..e476c42f895 100644
 
  dnl
 diff --git a/configure.ac b/configure.ac
-index 278dbd110d2..83b2e354112 100644
+index 965c0bdd853..9bcc644a766 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1480,6 +1480,9 @@ exec_prefix=$old_exec_prefix

patches/8.4/php-config.patch

@@ -58,7 +58,7 @@ index d8a5cbf0842..b5a5b26eba5 100644
  ])
 
 diff --git a/configure.ac b/configure.ac
-index 6dc1e45b34f..12d8cd679f5 100644
+index 3662d3e985b..d2074801fac 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1363,6 +1363,9 @@ exec_prefix=$old_exec_prefix

patches/8.5/php-config.patch

@@ -58,10 +58,10 @@ index 640f0100800..de89ceb45b1 100644
  ])
 
 diff --git a/configure.ac b/configure.ac
-index 01d9ded69b9..6f683b45862 100644
+index 61d1c350a82..a4b41411d1b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1369,6 +1369,9 @@ exec_prefix=$old_exec_prefix
+@@ -1382,6 +1382,9 @@ exec_prefix=$old_exec_prefix
  libdir=$old_libdir
  datadir=$old_datadir
 
@@ -71,7 +71,7 @@ index 01d9ded69b9..6f683b45862 100644
  AC_SUBST([INCLUDE_PATH])
  AC_SUBST([EXPANDED_PEAR_INSTALLDIR])
  AC_SUBST([EXPANDED_EXTENSION_DIR])
-@@ -1387,6 +1390,9 @@ AC_SUBST([SAPI_LIBNAME_STATIC])
+@@ -1400,6 +1403,9 @@ AC_SUBST([SAPI_LIBNAME_STATIC])
  AC_SUBST([PHP_VERSION])
  AC_SUBST([PHP_VERSION_ID])
  AC_SUBST([PHP_LDFLAGS])