Sync cache variable names

Author: petk

cmake/Zend/cmake/Signals.cmake

@@ -13,9 +13,10 @@ endif()
 
 message(CHECK_START "Checking whether to enable Zend signal handling")
 
-check_symbol_exists(sigaction signal.h HAVE_SIGACTION)
+check_symbol_exists(sigaction signal.h PHP_HAVE_SIGACTION)
+set(HAVE_SIGACTION ${PHP_HAVE_SIGACTION})
 
-if(HAVE_SIGACTION AND PHP_ZEND_SIGNALS)
+if(PHP_HAVE_SIGACTION AND PHP_ZEND_SIGNALS)
   message(CHECK_PASS "yes")
   set(ZEND_SIGNALS TRUE)
 

cmake/cmake/platforms/Windows.cmake

@@ -70,7 +70,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(HAVE_FCNTL_H TRUE)
   set(HAVE_FDATASYNC FALSE)
   set(HAVE_FLOCK FALSE)
-  set(HAVE_FORK FALSE)
   set(HAVE_FUNOPEN FALSE)
   set(HAVE_GETGRNAM_R FALSE)
   set(HAVE_GETLOADAVG FALSE)
@@ -197,7 +196,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(PHP_EXT_RANDOM_HAVE_COMMONCRYPTO_COMMONRANDOM_H FALSE)
   set(PHP_EXT_RANDOM_HAVE_DECL_ARC4RANDOM_BUF FALSE)
   set(PHP_EXT_RANDOM_HAVE_GETRANDOM FALSE)
-  set(PHP_HAS_CREATEPROCESS TRUE)
   set(PHP_HAS_DN_EXPAND FALSE)
   set(PHP_HAS_DN_SKIPNAME FALSE)
   set(PHP_HAS_DNS_SEARCH FALSE)
@@ -264,6 +262,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(PHP_HAS_WNO_UNUSED_PARAMETER_C FALSE)
   set(PHP_HAS_WNO_UNUSED_PARAMETER_CXX FALSE)
   set(PHP_HAS_WSTRICT_PROTOTYPES_C FALSE)
+  set(PHP_HAVE_CREATEPROCESS TRUE)
+  set(PHP_HAVE_FORK FALSE)
   set(PHP_HAVE_GRP_H FALSE)
   set(PHP_HAVE_UNISTD_H FALSE)
   set(PHP_SAPI_CLI_HAVE_PS_STRINGS FALSE)

cmake/ext/pcntl/CMakeLists.txt

@@ -83,13 +83,13 @@ target_compile_definitions(php_ext_pcntl PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE
 
 # Check for required functions.
 block()
-  check_symbol_exists(fork unistd.h HAVE_FORK)
-  check_symbol_exists(sigaction signal.h HAVE_SIGACTION)
-  check_symbol_exists(waitpid sys/wait.h HAVE_WAITPID)
+  check_symbol_exists(fork unistd.h PHP_HAVE_FORK)
+  check_symbol_exists(sigaction signal.h PHP_HAVE_SIGACTION)
+  check_symbol_exists(waitpid sys/wait.h PHP_HAVE_WAITPID)
 
   foreach(function fork sigaction waitpid)
     string(TOUPPER ${function} const)
-    if(NOT HAVE_${const})
+    if(NOT PHP_HAVE_${const})
       message(
         FATAL_ERROR
         "ext/pcntl: required function '${function}()' not found."
@@ -98,25 +98,42 @@ block()
   endforeach()
 endblock()
 
-check_symbol_exists(forkx sys/fork.h HAVE_FORKX)
-check_symbol_exists(getpriority sys/resource.h HAVE_GETPRIORITY)
-check_symbol_exists(rfork unistd.h HAVE_RFORK)
-check_symbol_exists(setpriority sys/resource.h HAVE_SETPRIORITY)
-check_symbol_exists(sigtimedwait signal.h HAVE_SIGTIMEDWAIT)
-check_symbol_exists(sigwaitinfo signal.h HAVE_SIGWAITINFO)
+check_symbol_exists(forkx sys/fork.h PHP_EXT_PCNTL_HAVE_FORKX)
+set(HAVE_FORKX ${PHP_EXT_PCNTL_HAVE_FORKX})
+
+check_symbol_exists(getpriority sys/resource.h PHP_EXT_PCNTL_HAVE_GETPRIORITY)
+set(HAVE_GETPRIORITY ${PHP_EXT_PCNTL_HAVE_GETPRIORITY})
+
+check_symbol_exists(rfork unistd.h PHP_EXT_PCNTL_HAVE_RFORK)
+set(HAVE_RFORK ${PHP_EXT_PCNTL_HAVE_RFORK})
+
+check_symbol_exists(setpriority sys/resource.h PHP_EXT_PCNTL_HAVE_SETPRIORITY)
+set(HAVE_SETPRIORITY ${PHP_EXT_PCNTL_HAVE_SETPRIORITY})
+
+check_symbol_exists(sigtimedwait signal.h PHP_EXT_PCNTL_HAVE_SIGTIMEDWAIT)
+set(HAVE_SIGTIMEDWAIT ${PHP_EXT_PCNTL_HAVE_SIGTIMEDWAIT})
+
+check_symbol_exists(sigwaitinfo signal.h PHP_EXT_PCNTL_HAVE_SIGWAITINFO)
+set(HAVE_SIGWAITINFO ${PHP_EXT_PCNTL_HAVE_SIGWAITINFO})
+
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(unshare sched.h HAVE_UNSHARE)
+  check_symbol_exists(unshare sched.h PHP_EXT_PCNTL_HAVE_UNSHARE)
+  set(HAVE_UNSHARE ${PHP_EXT_PCNTL_HAVE_UNSHARE})
 cmake_pop_check_state()
-check_symbol_exists(wait3 sys/wait.h HAVE_WAIT3)
-check_symbol_exists(wait4 sys/wait.h HAVE_WAIT4)
+
+check_symbol_exists(wait3 sys/wait.h PHP_EXT_PCNTL_HAVE_WAIT3)
+set(HAVE_WAIT3 ${PHP_EXT_PCNTL_HAVE_WAIT3})
+
+check_symbol_exists(wait4 sys/wait.h PHP_EXT_PCNTL_HAVE_WAIT4)
+set(HAVE_WAIT4 ${PHP_EXT_PCNTL_HAVE_WAIT4})
 
 cmake_push_check_state(RESET)
   set(CMAKE_EXTRA_INCLUDE_FILES "signal.h")
-  check_type_size(siginfo_t STRUCT_SIGINFO_T)
+  check_type_size(siginfo_t PHP_EXT_PCNTL_STRUCT_SIGINFO_T)
 cmake_pop_check_state()
 
-if(HAVE_STRUCT_SIGINFO_T)
+if(HAVE_PHP_EXT_PCNTL_STRUCT_SIGINFO_T)
   target_compile_definitions(php_ext_pcntl PRIVATE HAVE_STRUCT_SIGINFO_T)
 endif()
 

cmake/ext/pcntl/cmake/config.h.in

@@ -24,6 +24,3 @@
 
 /* Define to 1 if you have the 'wait4' function. */
 #cmakedefine HAVE_WAIT4 1
-
-/* Define to 1 if you have the 'waitpid' function. */
-#cmakedefine HAVE_WAITPID 1

cmake/ext/standard/CMakeLists.txt

@@ -288,11 +288,12 @@ include(cmake/CheckStrptime.cmake)
 # Check if there is a support means of creating a new process and defining which
 # handles it receives.
 message(CHECK_START "Checking if OS can spawn processes with inherited handles")
-check_symbol_exists(fork unistd.h HAVE_FORK)
-if(NOT HAVE_FORK)
-  check_symbol_exists(CreateProcess windows.h PHP_HAS_CREATEPROCESS)
+check_symbol_exists(fork unistd.h PHP_HAVE_FORK)
+set(HAVE_FORK ${PHP_HAVE_FORK})
+if(NOT PHP_HAVE_FORK)
+  check_symbol_exists(CreateProcess windows.h PHP_HAVE_CREATEPROCESS)
 endif()
-if(HAVE_FORK OR PHP_HAS_CREATEPROCESS)
+if(PHP_HAVE_FORK OR PHP_HAVE_CREATEPROCESS)
   set(PHP_CAN_SUPPORT_PROC_OPEN TRUE)
 
   message(CHECK_PASS "yes")