Merge branch 'PHP-8.4'

petk · petk · commit d4a00cf8eabf · 2025-08-09T01:56:57.000+02:00
diff --git a/cmake/cmake/modules/FindACL.cmake b/cmake/cmake/modules/FindACL.cmake
@@ -157,9 +157,8 @@ if(ACL_IS_BUILT_IN)
 else()
   set(_ACL_REQUIRED_VARS ACL_LIBRARY ACL_INCLUDE_DIR)
 
-  # Try pkg-config.
   find_package(PkgConfig QUIET)
-  if(PKG_CONFIG_FOUND)
+  if(PkgConfig_FOUND)
     pkg_check_modules(PC_ACL QUIET libacl)
   endif()
 
diff --git a/cmake/cmake/modules/FindApache.cmake b/cmake/cmake/modules/FindApache.cmake
@@ -198,9 +198,8 @@ if(Apache_APR_CONFIG_EXECUTABLE)
   )
 endif()
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_Apache_APR QUIET apr-1)
 endif()
 
diff --git a/cmake/cmake/modules/FindAppArmor.cmake b/cmake/cmake/modules/FindAppArmor.cmake
@@ -48,9 +48,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_AppArmor QUIET libapparmor)
 endif()
 
diff --git a/cmake/cmake/modules/FindArgon2.cmake b/cmake/cmake/modules/FindArgon2.cmake
@@ -48,9 +48,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_Argon2 QUIET libargon2)
 endif()
 
diff --git a/cmake/cmake/modules/FindCapstone.cmake b/cmake/cmake/modules/FindCapstone.cmake
@@ -46,9 +46,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_Capstone QUIET capstone)
 endif()
 
diff --git a/cmake/cmake/modules/FindCdb.cmake b/cmake/cmake/modules/FindCdb.cmake
@@ -48,9 +48,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_Cdb QUIET libcdb)
 endif()
 
diff --git a/cmake/cmake/modules/FindCrypt.cmake b/cmake/cmake/modules/FindCrypt.cmake
@@ -96,9 +96,8 @@ if(Crypt_IS_BUILT_IN)
 else()
   set(_Crypt_REQUIRED_VARS Crypt_LIBRARY Crypt_INCLUDE_DIR _Crypt_SANITY_CHECK)
 
-  # Try pkg-config.
   find_package(PkgConfig QUIET)
-  if(PKG_CONFIG_FOUND)
+  if(PkgConfig_FOUND)
     pkg_search_module(PC_Crypt QUIET libcrypt libxcrypt)
   endif()
 
diff --git a/cmake/cmake/modules/FindEditline.cmake b/cmake/cmake/modules/FindEditline.cmake
@@ -48,9 +48,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_Editline QUIET libedit)
 endif()
 
diff --git a/cmake/cmake/modules/FindEnchant.cmake b/cmake/cmake/modules/FindEnchant.cmake
@@ -49,9 +49,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_search_module(PC_Enchant QUIET enchant-2 enchant)
 endif()
 
diff --git a/cmake/cmake/modules/FindFFI.cmake b/cmake/cmake/modules/FindFFI.cmake
@@ -46,9 +46,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_FFI QUIET libffi)
 endif()
 
diff --git a/cmake/cmake/modules/FindGD.cmake b/cmake/cmake/modules/FindGD.cmake
@@ -46,9 +46,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_GD QUIET gdlib)
 endif()
 
diff --git a/cmake/cmake/modules/FindGMP.cmake b/cmake/cmake/modules/FindGMP.cmake
@@ -46,9 +46,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_GMP QUIET gmp)
 endif()
 
diff --git a/cmake/cmake/modules/FindICU.cmake b/cmake/cmake/modules/FindICU.cmake
@@ -20,7 +20,7 @@ set_package_properties(
 
 # Try pkg-config and append paths to the internal icu_roots variable.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   foreach(component ${ICU_FIND_COMPONENTS})
     string(TOUPPER ${component} component_upper)
     pkg_check_modules(PC_ICU_${component_upper} QUIET icu-${component})
diff --git a/cmake/cmake/modules/FindLDAP.cmake b/cmake/cmake/modules/FindLDAP.cmake
@@ -73,9 +73,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_LDAP QUIET ldap)
 endif()
 
@@ -106,7 +105,7 @@ if(LDAP_LIBRARY AND LDAP_INCLUDE_DIR)
 endif()
 
 if(LDAP_LIBRARY)
-  if(PKG_CONFIG_FOUND)
+  if(PkgConfig_FOUND)
     pkg_check_modules(PC_LDAP_LBER QUIET lber)
   endif()
 
diff --git a/cmake/cmake/modules/FindLMDB.cmake b/cmake/cmake/modules/FindLMDB.cmake
@@ -48,9 +48,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_LMDB QUIET lmdb)
 endif()
 
diff --git a/cmake/cmake/modules/FindMySQL.cmake b/cmake/cmake/modules/FindMySQL.cmake
@@ -127,9 +127,8 @@ if("Lib" IN_LIST MySQL_FIND_COMPONENTS)
       ERROR_QUIET
     )
   else()
-    # Try pkg-config.
     find_package(PkgConfig QUIET)
-    if(PKG_CONFIG_FOUND)
+    if(PkgConfig_FOUND)
       pkg_check_modules(PC_MySQL QUIET mysqlclient)
     endif()
   endif()
diff --git a/cmake/cmake/modules/FindNetSnmp.cmake b/cmake/cmake/modules/FindNetSnmp.cmake
@@ -49,9 +49,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_NetSnmp QUIET netsnmp)
 endif()
 
@@ -150,7 +149,6 @@ block(PROPAGATE NetSnmp_VERSION)
     endif()
   endif()
 
-  # Try pkg-config.
   if(
     NOT NetSnmp_VERSION
     AND PC_NetSNMP_VERSION
diff --git a/cmake/cmake/modules/FindODBC.cmake b/cmake/cmake/modules/FindODBC.cmake
@@ -106,7 +106,7 @@ mark_as_advanced(ODBC_CONFIG)
 ### Try pkg-config. ###########################################################
 if(NOT ODBC_CONFIG)
   find_package(PkgConfig QUIET)
-  if(PKG_CONFIG_FOUND)
+  if(PkgConfig_FOUND)
     if(ODBC_USE_DRIVER STREQUAL "unixODBC")
       pkg_check_modules(PC_ODBC QUIET odbc)
     elseif(ODBC_USE_DRIVER STREQUAL "iODBC")
diff --git a/cmake/cmake/modules/FindOniguruma.cmake b/cmake/cmake/modules/FindOniguruma.cmake
@@ -46,9 +46,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_Oniguruma QUIET oniguruma)
 endif()
 
diff --git a/cmake/cmake/modules/FindPCRE.cmake b/cmake/cmake/modules/FindPCRE.cmake
@@ -46,9 +46,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_PCRE QUIET libpcre2-8)
 endif()
 
diff --git a/cmake/cmake/modules/FindQDBM.cmake b/cmake/cmake/modules/FindQDBM.cmake
@@ -47,9 +47,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_QDBM QUIET qdbm)
 endif()
 
diff --git a/cmake/cmake/modules/FindSASL.cmake b/cmake/cmake/modules/FindSASL.cmake
@@ -46,9 +46,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_SASL QUIET libsasl2)
 endif()
 
diff --git a/cmake/cmake/modules/FindSELinux.cmake b/cmake/cmake/modules/FindSELinux.cmake
@@ -48,9 +48,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_Selinux QUIET libselinux)
 endif()
 
diff --git a/cmake/cmake/modules/FindSodium.cmake b/cmake/cmake/modules/FindSodium.cmake
@@ -46,9 +46,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_Sodium QUIET libsodium)
 endif()
 
diff --git a/cmake/cmake/modules/FindSystemd.cmake b/cmake/cmake/modules/FindSystemd.cmake
@@ -47,9 +47,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_Systemd QUIET libsystemd)
 endif()
 
diff --git a/cmake/cmake/modules/FindTidy.cmake b/cmake/cmake/modules/FindTidy.cmake
@@ -53,9 +53,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_Tidy QUIET tidy)
 endif()
 
diff --git a/cmake/cmake/modules/FindTokyoCabinet.cmake b/cmake/cmake/modules/FindTokyoCabinet.cmake
@@ -48,9 +48,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_TokyoCabinet QUIET tokyocabinet)
 endif()
 
diff --git a/cmake/cmake/modules/FindValgrind.cmake b/cmake/cmake/modules/FindValgrind.cmake
@@ -46,9 +46,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_Valgrind QUIET valgrind)
 
   # At the time of writing, valgrind.pc sets includedir, for example, as
diff --git a/cmake/cmake/modules/FindWebP.cmake b/cmake/cmake/modules/FindWebP.cmake
@@ -46,9 +46,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_WebP QUIET libwebp)
 endif()
 
diff --git a/cmake/cmake/modules/FindXPM.cmake b/cmake/cmake/modules/FindXPM.cmake
@@ -46,9 +46,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_XPM QUIET xpm)
 endif()
 
diff --git a/cmake/cmake/modules/Findlibavif.cmake b/cmake/cmake/modules/Findlibavif.cmake
@@ -48,9 +48,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_libavif QUIET libavif)
 endif()
 
diff --git a/cmake/cmake/modules/Findlibzip.cmake b/cmake/cmake/modules/Findlibzip.cmake
@@ -55,9 +55,8 @@ set_package_properties(
 
 set(_reason "")
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_libzip QUIET libzip)
 endif()
 
diff --git a/cmake/ext/skeleton/cmake/modules/FindPHP.cmake b/cmake/ext/skeleton/cmake/modules/FindPHP.cmake
@@ -90,9 +90,8 @@ find_program(
 # The PHP component.
 ################################################################################
 
-# Try pkg-config.
 find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_PHP QUIET php)
 endif()
 
@@ -162,15 +161,15 @@ if(PHP_CONFIG_EXECUTABLE)
     ERROR_QUIET
   )
 endif()
-if(NOT PHP_EXTENSION_DIR AND PKG_CONFIG_FOUND)
+if(NOT PHP_EXTENSION_DIR AND PkgConfig_FOUND)
   pkg_get_variable(PHP_EXTENSION_DIR php extensiondir)
 endif()
 
 ################################################################################
 # PHP Embed component.
 ################################################################################
 
-if(PKG_CONFIG_FOUND)
+if(PkgConfig_FOUND)
   pkg_check_modules(PC_PHP_EMBED QUIET php-embed)
 endif()
 

Original file line number	Diff line number	Diff line change
`@@ -198,9 +198,8 @@ if(Apache_APR_CONFIG_EXECUTABLE)`
`198`	`198`	`)`
`199`	`199`	`endif()`
`200`	`200`
`201`		`-# Try pkg-config.`
`202`	`201`	`find_package(PkgConfig QUIET)`
`203`		`-if(PKG_CONFIG_FOUND)`
	`202`	`+if(PkgConfig_FOUND)`
`204`	`203`	`pkg_check_modules(PC_Apache_APR QUIET apr-1)`
`205`	`204`	`endif()`
`206`	`205`