From ed35eac623c23ba6b7c5edfd676a3450c5abb93c Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Mon, 5 Aug 2024 01:20:49 +0200
Subject: [PATCH 1/2] Autotools: Add ext/readline preprocessor macros help
 texts

This adds the missing macros help texts for easier understanding. The
AC_DEFINE can be called with only 2 arguments if there is another
definition in the code where template (see AH_TEMPLATE Autoconf macro)
is read by autoheader (the 2nd AC_DEFINE sets the template for all other
definitions with the same name).
---
 ext/readline/config.m4 | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index 0ba5fd55656a2..33169fe0f4b38 100644
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -14,9 +14,6 @@ else
   php_with_readline=no
 fi
 
-AH_TEMPLATE([HAVE_ERASE_EMPTY_LINE],
-  [Define to 1 if edit/readline library has 'rl_erase_empty_line' variable.])
-
 if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
   for i in $PHP_READLINE /usr/local /usr; do
     test -f $i/include/readline/readline.h && READLINE_DIR=$i && break
@@ -52,17 +49,17 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
     [-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS])
 
   PHP_CHECK_LIBRARY([readline], [rl_callback_read_char],
-    [AC_DEFINE([HAVE_RL_CALLBACK_READ_CHAR], [1], [ ])],
+    [AC_DEFINE([HAVE_RL_CALLBACK_READ_CHAR], [1])],
     [],
     [-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS])
 
   PHP_CHECK_LIBRARY([readline], [rl_on_new_line],
-    [AC_DEFINE([HAVE_RL_ON_NEW_LINE], [1], [ ])],
+    [AC_DEFINE([HAVE_RL_ON_NEW_LINE], [1])],
     [],
     [-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS])
 
   PHP_CHECK_LIBRARY([readline], [rl_completion_matches],
-    [AC_DEFINE([HAVE_RL_COMPLETION_MATCHES], [1], [ ])],
+    [AC_DEFINE([HAVE_RL_COMPLETION_MATCHES], [1])],
     [],
     [-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS])
 
@@ -79,7 +76,7 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
   LDFLAGS=$LDFLAGS_SAVE
   LIBS=$LIBS_SAVE
 
-  AC_DEFINE(HAVE_HISTORY_LIST, 1, [ ])
+  AC_DEFINE([HAVE_HISTORY_LIST], [1])
   AC_DEFINE([HAVE_LIBREADLINE], [1],
     [Define to 1 if readline extension uses the 'readline' library.])
 
@@ -103,22 +100,29 @@ elif test "$PHP_LIBEDIT" != "no"; then
     [$READLINE_SHARED_LIBADD])
 
   PHP_CHECK_LIBRARY([edit], [rl_callback_read_char],
-    [AC_DEFINE([HAVE_RL_CALLBACK_READ_CHAR], [1], [ ])],
+    [AC_DEFINE([HAVE_RL_CALLBACK_READ_CHAR], [1],
+      [Define to 1 if edit/readline library has the 'rl_callback_read_char'
+      function.])],
     [],
     [$READLINE_SHARED_LIBADD])
 
   PHP_CHECK_LIBRARY([edit], [rl_on_new_line],
-    [AC_DEFINE([HAVE_RL_ON_NEW_LINE], [1], [ ])],
+    [AC_DEFINE([HAVE_RL_ON_NEW_LINE], [1],
+      [Define to 1 if edit/readline library has the 'rl_on_new_line'
+      function.])],
     [],
     [$READLINE_SHARED_LIBADD])
 
   PHP_CHECK_LIBRARY([edit], [rl_completion_matches],
-    [AC_DEFINE([HAVE_RL_COMPLETION_MATCHES], [1], [ ])],
+    [AC_DEFINE([HAVE_RL_COMPLETION_MATCHES], [1],
+      [Define to 1 if edit/readline library has the 'rl_completion_matches'
+      function.])],
     [],
     [$READLINE_SHARED_LIBADD])
 
   PHP_CHECK_LIBRARY([edit], [history_list],
-    [AC_DEFINE([HAVE_HISTORY_LIST], [1], [ ])],
+    [AC_DEFINE([HAVE_HISTORY_LIST], [1],
+      [Define to 1 if edit/readline library has the 'history_list' function.])],
     [],
     [$READLINE_SHARED_LIBADD])
 
@@ -127,7 +131,9 @@ elif test "$PHP_LIBEDIT" != "no"; then
   CFLAGS="$CFLAGS $EDIT_CFLAGS"
   LIBS="$LIBS $EDIT_LIBS"
   AC_CHECK_DECL([rl_erase_empty_line],
-    [AC_DEFINE([HAVE_ERASE_EMPTY_LINE], [1])],,
+    [AC_DEFINE([HAVE_ERASE_EMPTY_LINE], [1],
+      [Define to 1 if edit/readline library has the 'rl_erase_empty_line'
+      variable.])],,
     [#include <editline/readline.h>])
   CFLAGS=$CFLAGS_SAVE
   LIBS=$LIBS_SAVE

From 65cb323770339ee236d0e7c1705b13bcf7c927b1 Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Tue, 6 Aug 2024 09:06:25 +0200
Subject: [PATCH 2/2] [skip ci] Note that rl_erase_empty_line is a global
 variable for clarity

---
 ext/readline/config.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index 33169fe0f4b38..4b61ad4051293 100644
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -133,7 +133,7 @@ elif test "$PHP_LIBEDIT" != "no"; then
   AC_CHECK_DECL([rl_erase_empty_line],
     [AC_DEFINE([HAVE_ERASE_EMPTY_LINE], [1],
       [Define to 1 if edit/readline library has the 'rl_erase_empty_line'
-      variable.])],,
+      global variable.])],,
     [#include <editline/readline.h>])
   CFLAGS=$CFLAGS_SAVE
   LIBS=$LIBS_SAVE