Commit cad246f

committed

Autotools: Enhance phpdbg readline enabling

PHP_READLINE, PHP_LIBEDIT, and PHP_READLINE_LIBS variables are not available in sapi before the extensions arguments get processed by the configure script. But the Autoconf raw default variables with_readline and with_libedit are. This checks if readline support can be enabled in phpdbg This is partial fix towards the more proper phpGH-13184 or similar in the future to make phpdbg readline integration easier to use. Previous check silently enabled the phpdbg readline integration when readline is built as shared and failed on the make step: undefined reference to 'readline' undefined reference to 'add_history' These cases enable it: ./configure --enable-phpdbg-readline --with-libedit ./configure --enable-phpdbg-readline --with-readline These cases don't enable it: ./configure --enable-phpdbg-readline ./configure --enable-phpdbg-readline --with-libedit=shared ./configure --enable-phpdbg-readline --with-readline=shared

1 parent bd77462 commit cad246fCopy full SHA for cad246f

File tree

1 file changed

+18

-14

lines changed

sapi/phpdbg
- config.m4

1 file changed

+18

-14

lines changed

`‎sapi/phpdbg/config.m4‎`

Lines changed: 18 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,26 +21,30 @@ PHP_ARG_ENABLE([phpdbg-readline],`
`21`	`21`	`[no])`
`22`	`22`
`23`	`23`	`if test "$PHP_PHPDBG" != "no"; then`
	`24`	`+ AS_VAR_IF([PHP_PHPDBG_READLINE], [yes], [`
	`25`	`+ AC_MSG_CHECKING([if readline can be enabled in phpdbg])`
	`26`	`+ phpdbg_readline="no (readline extension is not enabled)"`
	`27`	`+ AS_IF(m4_normalize([`
	`28`	`+ (test -n "$with_readline" && test "x$with_readline" != xno) \|\|`
	`29`	`+ (test -n "$with_libedit" && test "x$with_libedit" != xno)`
	`30`	`+ ]), [phpdbg_readline=yes])`
	`31`	`+ AS_CASE([$with_readline], [shared],`
	`32`	`+ [phpdbg_readline="no (shared readline extension not supported)"])`
	`33`	`+ AS_CASE([$with_libedit], [shared],`
	`34`	`+ [phpdbg_readline="no (shared readline extension not supported)"])`
	`35`	`+ AS_VAR_IF([phpdbg_readline], [yes], [`
	`36`	`+ AC_DEFINE([HAVE_PHPDBG_READLINE], [1],`
	`37`	`+ [Define to 1 if the phpdbg SAPI has libedit/readline integration.])`
	`38`	`+ ])`
	`39`	`+ AC_MSG_RESULT([$phpdbg_readline])`
	`40`	`+ ])`
	`41`	`+`
`24`	`42`	`AC_HEADER_TIOCGWINSZ`
`25`	`43`
`26`	`44`	`PHP_PHPDBG_CFLAGS="-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"`
`27`	`45`	`AS_VAR_IF([PHP_PHPDBG_DEBUG], [no],,`
`28`	`46`	`[AS_VAR_APPEND([PHP_PHPDBG_CFLAGS], [" -DPHPDBG_DEBUG=1"])])`
`29`	`47`
`30`		`- AC_MSG_CHECKING([for phpdbg and readline integration])`
`31`		`- if test "$PHP_PHPDBG_READLINE" = "yes"; then`
`32`		`- if test "$PHP_READLINE" != "no" \|\| test "$PHP_LIBEDIT" != "no"; then`
`33`		`- AC_DEFINE([HAVE_PHPDBG_READLINE], [1],`
`34`		`- [Define to 1 if the phpdbg SAPI has libedit/readline integration.])`
`35`		`- PHPDBG_EXTRA_LIBS="$PHP_READLINE_LIBS"`
`36`		`- AC_MSG_RESULT([ok])`
`37`		`- else`
`38`		`- AC_MSG_RESULT([readline is not available])`
`39`		`- fi`
`40`		`- else`
`41`		`- AC_MSG_RESULT([disabled])`
`42`		`- fi`
`43`		`-`
`44`	`48`	`AH_TEMPLATE([HAVE_USERFAULTFD_WRITEFAULT],`
`45`	`49`	`[Define to 1 if faulting on write-protected memory support can be compiled`
`46`	`50`	`for userfaultfd.])`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit cad246f

File tree

1 file changed

1 file changed

`‎sapi/phpdbg/config.m4‎`

0 commit comments