Commit 6e5944a

committed

Autotools: Add 4th argument for PHP_SETUP_EDIT macro

1 parent 829187c commit 6e5944aCopy full SHA for 6e5944a

File tree

3 files changed

+13

-13

lines changed

build
- php.m4
ext/readline
- config.m4
sapi/phpdbg
- config.m4

3 files changed

+13

-13

lines changed

`‎build/php.m4‎`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2004,14 +2004,16 @@ 2ドル],`
`2004`	`2004`
`2005`	`2005`	`dnl`
`2006`	`2006`	`dnl`
`2007`		`-dnl PHP_SETUP_EDIT([shared-add], [action-if-found], [action-if-not-found])`
	`2007`	`+dnl PHP_SETUP_EDIT([shared-add], [action-if-found], [action-if-not-found], [not-extension])`
`2008`	`2008`	`dnl`
`2009`		`-dnl Common setup macro for linking libedit library.`
	`2009`	`+dnl Common setup macro for linking libedit library. If "not-extension" argument`
	`2010`	`+dnl is passed, the found library is appended to the "shared-add" variable`
	`2011`	`+dnl unconditionally (for SAPIs).`
`2010`	`2012`	`dnl`
`2011`	`2013`	`AC_DEFUN([PHP_SETUP_EDIT], [`
`2012`	`2014`	`PKG_CHECK_MODULES([EDIT], [libedit], [`
`2013`	`2015`	`PHP_EVAL_INCLINE([$EDIT_CFLAGS])`
`2014`		`- PHP_EVAL_LIBLINE([$EDIT_LIBS], [1ドル])`
	`2016`	`+ PHP_EVAL_LIBLINE([$EDIT_LIBS], [1ドル], [4ドル])`
`2015`	`2017`	`AC_DEFINE([HAVE_LIBEDIT], [1],`
`2016`	`2018`	`[Define to 1 if 'libedit' library is available.])`
`2017`	`2019`	`2ドル`

`‎ext/readline/config.m4‎`

Lines changed: 7 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,28 +25,26 @@ if test "$PHP_READLINE" != "no"; then`
`25`	`25`
`26`	`26`	`PHP_CHECK_LIBRARY([edit], [rl_callback_read_char],`
`27`	`27`	`[AC_DEFINE([HAVE_RL_CALLBACK_READ_CHAR], [1],`
`28`		`- [Define to 1 if edit/readline library has the 'rl_callback_read_char'`
`29`		`- function.])],`
	`28`	`+ [Define to 1 if edit library has the 'rl_callback_read_char' function.])],`
`30`	`29`	`[],`
`31`	`30`	`[$READLINE_SHARED_LIBADD])`
`32`	`31`
`33`	`32`	`PHP_CHECK_LIBRARY([edit], [rl_on_new_line],`
`34`	`33`	`[AC_DEFINE([HAVE_RL_ON_NEW_LINE], [1],`
`35`		`- [Define to 1 if edit/readline library has the 'rl_on_new_line'`
`36`		`- function.])],`
	`34`	`+ [Define to 1 if edit library has the 'rl_on_new_line' function.])],`
`37`	`35`	`[],`
`38`	`36`	`[$READLINE_SHARED_LIBADD])`
`39`	`37`
`40`	`38`	`PHP_CHECK_LIBRARY([edit], [rl_completion_matches],`
`41`	`39`	`[AC_DEFINE([HAVE_RL_COMPLETION_MATCHES], [1],`
`42`		`- [Define to 1 if edit/readline library has the 'rl_completion_matches'`
	`40`	`+ [Define to 1 if edit library has the 'rl_completion_matches'`
`43`	`41`	`function.])],`
`44`	`42`	`[],`
`45`	`43`	`[$READLINE_SHARED_LIBADD])`
`46`	`44`
`47`	`45`	`PHP_CHECK_LIBRARY([edit], [history_list],`
`48`	`46`	`[AC_DEFINE([HAVE_HISTORY_LIST], [1],`
`49`		`- [Define to 1 if edit/readline library has the 'history_list' function.])],`
	`47`	`+ [Define to 1 if edit library has the 'history_list' function.])],`
`50`	`48`	`[],`
`51`	`49`	`[$READLINE_SHARED_LIBADD])`
`52`	`50`
`@@ -56,13 +54,13 @@ if test "$PHP_READLINE" != "no"; then`
`56`	`54`	`LIBS="$LIBS $EDIT_LIBS"`
`57`	`55`	`AC_CHECK_DECL([rl_erase_empty_line],`
`58`	`56`	`[AC_DEFINE([HAVE_ERASE_EMPTY_LINE], [1],`
`59`		`- [Define to 1 if edit/readline library has the 'rl_erase_empty_line'`
`60`		`- global variable.])],,`
	`57`	`+ [Define to 1 if edit library has the 'rl_erase_empty_line' global`
	`58`	`+ variable.])],,`
`61`	`59`	`[#include <editline/readline.h>])`
`62`	`60`	`CFLAGS=$CFLAGS_SAVE`
`63`	`61`	`LIBS=$LIBS_SAVE`
`64`	`62`
`65`		`-dnl Add -Wno-strict-prototypes as depends on user libs`
	`63`	`+dnl Add -Wno-strict-prototypes as depends on user libs`
`66`	`64`	`PHP_NEW_EXTENSION([readline],`
`67`	`65`	`[readline.c readline_cli.c],`
`68`	`66`	`[$ext_shared],`

`‎sapi/phpdbg/config.m4‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ if test "$PHP_PHPDBG" != "no"; then`
`30`	`30`	`AS_VAR_IF([PHP_PHPDBG_READLINE], [yes], [`
`31`	`31`	`PHP_SETUP_EDIT([PHPDBG_EXTRA_LIBS],,, [yes])`
`32`	`32`	`AC_DEFINE([HAVE_PHPDBG_READLINE], [1],`
`33`		`- [Define to 1 if the phpdbg SAPI has libedit/readline integration.])`
	`33`	`+ [Define to 1 if the phpdbg SAPI has libedit integration.])`
`34`	`34`	`])`
`35`	`35`
`36`	`36`	`AH_TEMPLATE([HAVE_USERFAULTFD_WRITEFAULT],`

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 6e5944a

File tree

3 files changed

3 files changed

`‎build/php.m4‎`

`‎ext/readline/config.m4‎`

`‎sapi/phpdbg/config.m4‎`

0 commit comments