From fa2b106e5e1918b78e5058e19f892b48cfde8e6b Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Fri, 26 Jul 2024 01:44:23 +0200
Subject: [PATCH] Autotools: Fix rl_erase_empty_line check

When building with readline/libedit installed at non-standard or
non-system paths the check flags also need to be adjusted a bit to be
able to check for the declared variable.
---
 ext/readline/config.m4 | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index d810157a302f7..2679c5d51067e 100644
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -78,9 +78,18 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
     -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
   ])
 
+  CFLAGS_SAVE=$CFLAGS
+  LDFLAGS_SAVE=$LDFLAGS
+  LIBS_SAVE=$LIBS
+  CFLAGS="$CFLAGS $INCLUDES"
+  LDFLAGS="$LDFLAGS -L$READLINE_DIR/$PHP_LIBDIR"
+  LIBS="$LIBS -lreadline"
   AC_CHECK_DECL([rl_erase_empty_line],
     [AC_DEFINE([HAVE_ERASE_EMPTY_LINE], [1])],,
     [#include <readline/readline.h>])
+  CFLAGS=$CFLAGS_SAVE
+  LDFLAGS=$LDFLAGS_SAVE
+  LIBS=$LIBS_SAVE
 
   AC_DEFINE(HAVE_HISTORY_LIST, 1, [ ])
   AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
@@ -140,9 +149,15 @@ elif test "$PHP_LIBEDIT" != "no"; then
     $READLINE_SHARED_LIBADD
   ])
 
+  CFLAGS_SAVE=$CFLAGS
+  LIBS_SAVE=$LIBS
+  CFLAGS="$CFLAGS $EDIT_CFLAGS"
+  LIBS="$LIBS $EDIT_LIBS"
   AC_CHECK_DECL([rl_erase_empty_line],
     [AC_DEFINE([HAVE_ERASE_EMPTY_LINE], [1])],,
     [#include <editline/readline.h>])
+  CFLAGS=$CFLAGS_SAVE
+  LIBS=$LIBS_SAVE
 
   AC_DEFINE(HAVE_LIBEDIT, 1, [ ])
 fi