Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

.github/workflows/ci.yaml

@@ -78,7 +78,6 @@ jobs:
             libfreetype-dev \
             libldap2-dev \
             unixodbc-dev \
-            libodbc2 \
             freetds-dev \
             libsnmp-dev \
             snmp \

cmake/cmake/modules/FindACL.cmake

@@ -143,7 +143,9 @@ else()
 
   # Use pkgconf, if available on the system.
   find_package(PkgConfig QUIET)
-  pkg_check_modules(PC_ACL QUIET libacl)
+  if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_ACL QUIET libacl)
+  endif()
 
   find_path(
     ACL_INCLUDE_DIR

cmake/cmake/modules/FindApache.cmake

@@ -193,7 +193,9 @@ endif()
 # Find the apr library (Apache portable runtime).
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_Apache_APR QUIET apr-1)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_Apache_APR QUIET apr-1)
+endif()
 
 find_path(
   Apache_APR_INCLUDE_DIR

cmake/cmake/modules/FindAppArmor.cmake

@@ -37,7 +37,9 @@ set(_reason "")
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_AppArmor QUIET libapparmor)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_AppArmor QUIET libapparmor)
+endif()
 
 find_path(
   AppArmor_INCLUDE_DIR

cmake/cmake/modules/FindArgon2.cmake

@@ -36,7 +36,9 @@ set(_reason "")
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_Argon2 QUIET libargon2)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_Argon2 QUIET libargon2)
+endif()
 
 find_path(
   Argon2_INCLUDE_DIR

cmake/cmake/modules/FindCapstone.cmake

@@ -36,7 +36,9 @@ set(_reason "")
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_Capstone QUIET capstone)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_Capstone QUIET capstone)
+endif()
 
 find_path(
   Capstone_INCLUDE_DIR

cmake/cmake/modules/FindCdb.cmake

@@ -37,7 +37,9 @@ set(_reason "")
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_Cdb QUIET libcdb)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_Cdb QUIET libcdb)
+endif()
 
 find_path(
   Cdb_INCLUDE_DIR

cmake/cmake/modules/FindCrypt.cmake

@@ -85,7 +85,9 @@ else()
 
   # Use pkgconf, if available on the system.
   find_package(PkgConfig QUIET)
-  pkg_search_module(PC_Crypt QUIET libcrypt libxcrypt)
+  if(PKG_CONFIG_FOUND)
+    pkg_search_module(PC_Crypt QUIET libcrypt libxcrypt)
+  endif()
 
   find_path(
     Crypt_INCLUDE_DIR

cmake/cmake/modules/FindEditline.cmake

@@ -37,7 +37,9 @@ set(_reason "")
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_Editline QUIET libedit)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_Editline QUIET libedit)
+endif()
 
 find_path(
   Editline_INCLUDE_DIR

cmake/cmake/modules/FindEnchant.cmake

@@ -43,7 +43,9 @@ endif()
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_Enchant QUIET ${_enchant_name})
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_Enchant QUIET ${_enchant_name})
+endif()
 
 find_path(
   Enchant_INCLUDE_DIR