Fixed bug #70899 (buildconf failure in extensions)

diff --git a/NEWS b/NEWS
index 842b72ad920093f223cd28602d38d63d3e1306c6..f126bbe76fe9958e112f5508f2b8b6ae4e8a6228 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ PHP                                                                        NEWS
     array property). (Laruence)
   . Fixed bug #70898, #70895 (null ptr deref and segfault with crafted callable).
     (Anatol, Laruence)
+  . Fixed bug #70899 (buildconf failure in extensions). (Bob, Reeze)
 
 - Mysqlnd:
   . Fixed bug #68077 (LOAD DATA LOCAL INFILE / open_basedir restriction).

diff --git a/build/config-stubs b/build/config-stubs
index 765eb541b09cf3e9f832e4b95a90dea8da8387d3..fb49bd4e8cd5eb90ea78912af132bed3efd48652 100755 (executable)
--- a/build/config-stubs
+++ b/build/config-stubs
@@ -4,7 +4,9 @@
 
 dir=$1; shift
 for stubfile in $dir/*/config0.m4 $dir/*/config.m4 $dir/*/config9.m4; do
-    echo "config_m4_src=$stubfile
-config_m4_dir=`dirname $stubfile`
+    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`])
 sinclude($stubfile)"
 done