Patch resolve-circular-readline-dependency.diff for Compile Failure Bug #71924

Patch version 2016-07-06 19:25 UTC

Obsoleted by patches:

• resolve-circular-readline-dependency.diff, revision 2016-07-09 19:39 UTC

Developer: bernd@bpj-code.co.za

  diff --git a/acinclude.m4 b/acinclude.m4
 index 28506b6..fd3fbc2 100644
 index 28506b6..db53e3f 100644
  --- a/acinclude.m4
  +++ b/acinclude.m4
  @@ -138,6 +138,7 @@ dnl PHP_INIT_BUILD_SYSTEM
   dnl


  +PHP_CONFIG_CONTEXT([`dirname $stubfile`])
   sinclude($stubfile)"
   done
  diff --git a/configure.in b/configure.in
 index 142cf7f..bc407d5 100644
 index 142cf7f..c475858 100644
  --- a/configure.in
  +++ b/configure.in
 @@ -1523,6 +1523,7 @@ PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.frag,$abs_srcdir/Zend,Zend)
  PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Zend/Makefile.frag,$abs_srcdir/Zend,Zend)
 @@ -1541,6 +1541,8 @@ dnl Check for unknown configure options
  dnl
  PHP_CHECK_CONFIGURE_OPTIONS
   
  PHP_GEN_BUILD_DIRS
  +m4_undivert([BODY_POSTSELECT])
  PHP_GEN_GLOBAL_MAKEFILE
  
  AC_DEFINE([HAVE_BUILD_DEFS_H], 1, [ ])
 +
  dnl
  dnl Generate build files
  dnl
  diff --git a/sapi/phpdbg/config.m4 b/sapi/phpdbg/config.m4
 index 9fb4e62..3afabed2 100644
 index 9fb4e62..4aa2dad 100644
  --- a/sapi/phpdbg/config.m4
  +++ b/sapi/phpdbg/config.m4
  @@ -11,6 +11,7 @@ PHP_ARG_ENABLE(phpdbg-webhelper, for phpdbg web SAPI support,
   PHP_ARG_ENABLE(phpdbg-debug, for phpdbg debug build,
Line 66 (now 67), was 17 lines, now 8 lines

  +m4_divert_text([BODY_POSTSELECT], [PHP_CONFIG_CONTEXT([sapi/phpdbg])dnl
   if test "$BUILD_PHPDBG" = "" && test "$PHP_PHPDBG" != "no"; then
     AC_HEADER_TIOCGWINSZ
     AC_DEFINE(HAVE_PHPDBG, 1, [ ])
 @@ -25,7 +26,7 @@ if test "$BUILD_PHPDBG" = "" && test "$PHP_PHPDBG" != "no"; then
    PHP_PHPDBG_FILES="phpdbg.c phpdbg_parser.c phpdbg_lexer.c phpdbg_prompt.c phpdbg_help.c phpdbg_break.c phpdbg_print.c phpdbg_bp.c phpdbg_opcode.c phpdbg_list.c phpdbg_utils.c phpdbg_info.c phpdbg_cmd.c phpdbg_set.c phpdbg_frame.c phpdbg_watch.c phpdbg_btree.c phpdbg_sigsafe.c phpdbg_wait.c phpdbg_io.c phpdbg_eol.c phpdbg_out.c"
  
    if test "$PHP_READLINE" != "no" -o  "$PHP_LIBEDIT" != "no"; then
 -  	PHPDBG_EXTRA_LIBS="$PHP_READLINE_LIBS"
 +  	PHPDBG_EXTRA_LIBS="$READLINE_SHARED_LIBADD $PHP_READLINE_LIBS"
    fi
    
    PHP_SUBST(PHP_PHPDBG_CFLAGS)
  @@ -64,6 +65,7 @@ if test "$BUILD_PHPDBG" = "" && test "$PHP_PHPDBG" != "no"; then
     PHP_SUBST(BUILD_PHPDBG)
     PHP_SUBST(BUILD_PHPDBG_SHARED)
   fi