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

Patch version 2016-07-09 21:43 UTC

Obsolete patches:

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

• 2016-07-09 21:43 UTC [diff to current]
• 2016-07-09 19:39 UTC [diff to current]
• 2016-07-06 19:25 UTC [diff to current]

Developer: bernd@bpj-code.co.za

diff --git a/acinclude.m4 b/acinclude.m4
index 28506b6..fd3fbc2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -138,6 +138,7 @@ dnl PHP_INIT_BUILD_SYSTEM
 dnl
 AC_DEFUN([PHP_INIT_BUILD_SYSTEM],[
 AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
+m4_define([_m4_divert(BODY_POSTSELECT)], 1001)dnl
 test -d include || $php_shtool mkdir include
 > Makefile.objects
 > Makefile.fragments
@@ -147,6 +148,18 @@ $EGREP $pattern'.*include/php' $srcdir/configure|$SED 's/.*>//'|xargs touch 2>/d
 ])
 
 dnl
+dnl PHP_CONFIG_CONTEXT
+dnl
+dnl Set the build system context to the given directory, as if output from
+dnl config-stubs.
+dnl
+AC_DEFUN([PHP_CONFIG_CONTEXT],[
+AC_DEFUN([PHP_EXT_BUILDDIR], [$1])dnl
+AC_DEFUN([PHP_EXT_DIR], [$1])dnl
+AC_DEFUN([PHP_EXT_SRCDIR], [$abs_srcdir/$1])dnl
+])
+
+dnl
 dnl PHP_GEN_GLOBAL_MAKEFILE
 dnl 
 dnl Generates the global makefile.
diff --git a/build/config-stubs b/build/config-stubs
index fb49bd4..2a16f13 100755
--- a/build/config-stubs
+++ b/build/config-stubs
@@ -5,8 +5,6 @@
 dir=$1; shift
 for stubfile in $dir/*/config0.m4 $dir/*/config.m4 $dir/*/config9.m4; do
     echo "dnl Define where extension directories are located in the configure context
-AC_DEFUN([PHP_EXT_BUILDDIR], [`dirname $stubfile`])
-AC_DEFUN([PHP_EXT_DIR], [`dirname $stubfile`])
-AC_DEFUN([PHP_EXT_SRCDIR], [\$abs_srcdir/`dirname $stubfile`])
+PHP_CONFIG_CONTEXT([`dirname $stubfile`])
 sinclude($stubfile)"
 done
diff --git a/configure.in b/configure.in
index 142cf7f..bc407d5 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)
 
 PHP_GEN_BUILD_DIRS
+m4_undivert([BODY_POSTSELECT])
 PHP_GEN_GLOBAL_MAKEFILE
 
 AC_DEFINE([HAVE_BUILD_DEFS_H], 1, [ ])
diff --git a/sapi/phpdbg/config.m4 b/sapi/phpdbg/config.m4
index 9fb4e62..3afabed2 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,
 [  --enable-phpdbg-debug      Build phpdbg in debug mode], no, no)
 
+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
+])dnl
 
 if test "$PHP_PHPDBG_WEBHELPER" != "no"; then
   PHP_NEW_EXTENSION(phpdbg_webhelper, phpdbg_rinit_hook.c phpdbg_webdata_transfer.c, $ext_shared)