Merge branch 'PHP-8.4'

Author: petk

cmake/ext/readline/config.cmake.h.in

@@ -1,20 +1,18 @@
-/* Define to 1 if edit/readline library has the 'rl_erase_empty_line' global
+/* Define to 1 if edit library has the 'rl_erase_empty_line' global
    variable. */
 #cmakedefine HAVE_ERASE_EMPTY_LINE 1
 
-/* Define to 1 if edit/readline library has the 'history_list' function. */
+/* Define to 1 if edit library has the 'history_list' function. */
 #cmakedefine HAVE_HISTORY_LIST 1
 
-/* Define to 1 if readline extension uses the 'libedit' library. */
+/* Define to 1 if PHP uses the 'libedit' library. */
 #cmakedefine HAVE_LIBEDIT 1
 
-/* Define to 1 if edit/readline library has the 'rl_callback_read_char'
-   function. */
+/* Define to 1 if edit library has the 'rl_callback_read_char' function. */
 #cmakedefine HAVE_RL_CALLBACK_READ_CHAR 1
 
-/* Define to 1 if edit/readline library has the 'rl_completion_matches'
-   function. */
+/* Define to 1 if edit library has the 'rl_completion_matches' function. */
 #cmakedefine HAVE_RL_COMPLETION_MATCHES 1
 
-/* Define to 1 if edit/readline library has the 'rl_on_new_line' function. */
+/* Define to 1 if edit library has the 'rl_on_new_line' function. */
 #cmakedefine HAVE_RL_ON_NEW_LINE 1

cmake/main/php_config.cmake.h.in

@@ -237,9 +237,6 @@
 /* Define to 1 if you have the 'dl' library (-ldl). */
 #cmakedefine HAVE_LIBDL 1
 
-/* Define to 1 if system has the 'libedit' library. */
-#cmakedefine HAVE_LIBEDIT 1
-
 /* Define to 1 if you have the <linux/sock_diag.h> header file. */
 #cmakedefine HAVE_LINUX_SOCK_DIAG_H 1
 

cmake/sapi/phpdbg/CMakeLists.txt

@@ -132,8 +132,7 @@ if(SAPI_PHPDBG_READLINE OR EXT_READLINE)
 
   target_link_libraries(php_phpdbg PRIVATE Editline::Editline)
 
-  set(HAVE_LIBEDIT 1 CACHE INTERNAL "Whether the libedit is available")
-
+  set(HAVE_LIBEDIT)
   set(HAVE_PHPDBG_READLINE 1)
 else()
   message(CHECK_FAIL "disabled")

cmake/sapi/phpdbg/config.cmake.h.in

@@ -1,6 +1,9 @@
 /* Define to 1 if 'TIOCGWINSZ' requires <sys/ioctl.h>. */
 #cmakedefine GWINSZ_IN_SYS_IOCTL 1
 
+/* Define to 1 if PHP uses the 'libedit' library. */
+#cmakedefine HAVE_LIBEDIT 1
+
 /* Define to 1 if the phpdbg SAPI has libedit/readline integration. */
 #cmakedefine HAVE_PHPDBG_READLINE 1