22 lines
842 B
Diff
22 lines
842 B
Diff
diff '--color=auto' -Naur php.orig/ext/intl/config.m4 php.new/ext/intl/config.m4
|
|
--- a/ext/intl/config.m4 2022-10-31 11:36:14.000000000 +0100
|
|
+++ b/ext/intl/config.m4 2024-12-21 19:16:00.921035577 +0100
|
|
@@ -83,7 +83,16 @@
|
|
breakiterator/codepointiterator_methods.cpp"
|
|
|
|
PHP_REQUIRE_CXX()
|
|
- PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX)
|
|
+
|
|
+ AC_MSG_CHECKING([if intl requires -std=gnu++17])
|
|
+ AS_IF([$PKG_CONFIG icu-uc --atleast-version=74],[
|
|
+ AC_MSG_RESULT([yes])
|
|
+ PHP_CXX_COMPILE_STDCXX(17, mandatory, PHP_INTL_STDCXX)
|
|
+ ],[
|
|
+ AC_MSG_RESULT([no])
|
|
+ PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX)
|
|
+ ])
|
|
+
|
|
PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS"
|
|
if test "$ext_shared" = "no"; then
|
|
PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CXX_SOURCES, $PHP_INTL_CXX_FLAGS)
|