Skip to content

Commit 2141094

Browse files
authored
Autotools: Fix rl_erase_empty_line check (#15109)
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.
1 parent ff4b99e commit 2141094

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

ext/readline/config.m4

+15
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,18 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
7676
-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
7777
])
7878

79+
CFLAGS_SAVE=$CFLAGS
80+
LDFLAGS_SAVE=$LDFLAGS
81+
LIBS_SAVE=$LIBS
82+
CFLAGS="$CFLAGS $INCLUDES"
83+
LDFLAGS="$LDFLAGS -L$READLINE_DIR/$PHP_LIBDIR"
84+
LIBS="$LIBS -lreadline"
7985
AC_CHECK_DECL([rl_erase_empty_line],
8086
[AC_DEFINE([HAVE_ERASE_EMPTY_LINE], [1])],,
8187
[#include <readline/readline.h>])
88+
CFLAGS=$CFLAGS_SAVE
89+
LDFLAGS=$LDFLAGS_SAVE
90+
LIBS=$LIBS_SAVE
8291

8392
AC_DEFINE(HAVE_HISTORY_LIST, 1, [ ])
8493
AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
@@ -133,9 +142,15 @@ elif test "$PHP_LIBEDIT" != "no"; then
133142
$READLINE_SHARED_LIBADD
134143
])
135144

145+
CFLAGS_SAVE=$CFLAGS
146+
LIBS_SAVE=$LIBS
147+
CFLAGS="$CFLAGS $EDIT_CFLAGS"
148+
LIBS="$LIBS $EDIT_LIBS"
136149
AC_CHECK_DECL([rl_erase_empty_line],
137150
[AC_DEFINE([HAVE_ERASE_EMPTY_LINE], [1])],,
138151
[#include <editline/readline.h>])
152+
CFLAGS=$CFLAGS_SAVE
153+
LIBS=$LIBS_SAVE
139154

140155
AC_DEFINE(HAVE_LIBEDIT, 1, [ ])
141156
fi

0 commit comments

Comments
 (0)