Sync and improve extension configuration headers

- ext/hash
- ext/intl
- ext/openssl
- ext/random
- ext/session

Author: petk

cmake/ext/hash/config.cmake.h.in

@@ -1,5 +1,5 @@
-/* Define to 1 if mhash support is enabled. */
-#cmakedefine PHP_MHASH_BC 1
-
 /* Define to 1 if the PHP hash extension uses the slow SHA3 algorithm. */
 #cmakedefine HAVE_SLOW_HASH3 1
+
+/* Define to 1 if mhash support is enabled. */
+#cmakedefine PHP_MHASH_BC 1

cmake/ext/intl/CMakeLists.txt

@@ -194,5 +194,3 @@ if(ICU_VERSION VERSION_GREATER_EQUAL 60)
 endif()
 
 add_dependencies(php_intl php_date)
-
-configure_file(config.cmake.h.in config.h @ONLY)

cmake/ext/intl/config.cmake.h.in

@@ -104,15 +104,15 @@ set_package_properties(
 # Link publicly for internal_functions files.
 target_link_libraries(php_openssl PUBLIC OpenSSL::SSL OpenSSL::Crypto)
 
-block(PROPAGATE HAVE_OPENSSL_EXT)
+block(PROPAGATE HAVE_OPENSSL_EXT_CODE)
   get_target_property(type php_openssl TYPE)
   if(
     CMAKE_SYSTEM_NAME STREQUAL "Windows" AND
     type MATCHES "^(MODULE|SHARED)_LIBRARY$"
   )
-    set(HAVE_OPENSSL_EXT "#define HAVE_OPENSSL_EXT 0")
+    set(HAVE_OPENSSL_EXT_CODE "#define HAVE_OPENSSL_EXT 0")
   else()
-    set(HAVE_OPENSSL_EXT "#define HAVE_OPENSSL_EXT 1")
+    set(HAVE_OPENSSL_EXT_CODE "#define HAVE_OPENSSL_EXT 1")
   endif()
 endblock()
 

cmake/ext/openssl/CMakeLists.txt

@@ -3,7 +3,7 @@
    and built as shared. Elsewhere it is defined to value 1 when enabled.
    This platform-dependent definition inconsistency has been addressed as of
    PHP 8.4: https://github.com/php/php-src/pull/14333. */
-@HAVE_OPENSSL_EXT@
+@HAVE_OPENSSL_EXT_CODE@
 
 /* Define to 1 if the PHP extension 'openssl' is available. */
 #cmakedefine HAVE_OPENSSL 1

cmake/ext/openssl/config.cmake.h.in

@@ -1,9 +1,9 @@
+/* Define to 1 if you have the <CommonCrypto/CommonRandom.h> header file. */
+#cmakedefine HAVE_COMMONCRYPTO_COMMONRANDOM_H 1
+
 /* Define to 1 if you have the declaration of 'arc4random_buf', and to 0 if
    you don't. */
 #cmakedefine01 HAVE_DECL_ARC4RANDOM_BUF
 
 /* Define to 1 if you have the 'getrandom' function. */
 #cmakedefine HAVE_GETRANDOM 1
-
-/* Define to 1 if you have the <CommonCrypto/CommonRandom.h> header file. */
-#cmakedefine HAVE_COMMONCRYPTO_COMMONRANDOM_H 1

cmake/ext/random/config.cmake.h.in

@@ -3,3 +3,15 @@
 
 /* Define to 1 if the PHP extension 'session' is available. */
 #cmakedefine HAVE_PHP_SESSION 1
+
+/* Define to 1 if you have the 'pread' function. */
+#cmakedefine HAVE_PREAD 1
+
+/* Define to 1 if you have the 'pwrite' function. */
+#cmakedefine HAVE_PWRITE 1
+
+/* Define to 1 if 'pread' declaration with 'off64_t' is missing. */
+#cmakedefine PHP_PREAD_64 1
+
+/* Define to 1 if 'pwrite' declaration with 'off64_t' is missing. */
+#cmakedefine PHP_PWRITE_64 1

cmake/ext/session/config.cmake.h.in

@@ -373,9 +373,6 @@
 /* Define to 1 if you have the 'prctl' function. */
 #cmakedefine HAVE_PRCTL 1
 
-/* Define to 1 if you have the 'pread' function. */
-#cmakedefine HAVE_PREAD 1
-
 /* Define to 1 if you have the 'procctl' function. */
 #cmakedefine HAVE_PROCCTL 1
 
@@ -400,9 +397,6 @@
 /* Define to 1 if you have the <pwd.h> header file. */
 #cmakedefine HAVE_PWD_H 1
 
-/* Define to 1 if you have the 'pwrite' function. */
-#cmakedefine HAVE_PWRITE 1
-
 /* Define to 1 if you have the <resolv.h> header file. */
 #cmakedefine HAVE_RESOLV_H 1
 
@@ -772,12 +766,6 @@
 /* The 'uname' output. */
 #define PHP_OS "@CMAKE_SYSTEM_NAME@"
 
-/* Define to 1 if 'pread' declaration with 'off64_t' is missing. */
-#cmakedefine PHP_PREAD_64 1
-
-/* Define to 1 if 'pwrite' declaration with 'off64_t' is missing. */
-#cmakedefine PHP_PWRITE_64 1
-
 /* Define to 1 if PHP uses its own SIGCHLD handler, and to 0 if not. */
 #cmakedefine01 PHP_SIGCHILD