Autotools: Set ext_srcdir, ext_dir and ext_builddir

Instead of setting these special variables only when PHP_NEW_EXTENSION
is called these can be simply set before the extension or SAPI config m4
file is included (using the config-stubs or in phpize).

Author: petk

build/config-stubs

@@ -3,8 +3,11 @@
 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)])
+ext_builddir=$(dirname $stubfile)
+ext_dir=$(dirname $stubfile)
+ext_srcdir=\$abs_srcdir/$(dirname $stubfile)
+AC_DEFUN([PHP_EXT_BUILDDIR], [\$ext_builddir])
+AC_DEFUN([PHP_EXT_DIR], [\$ext_dir])
+AC_DEFUN([PHP_EXT_SRCDIR], [\$ext_srcdir])
 sinclude($stubfile)"
 done

build/php.m4

@@ -936,10 +936,6 @@ dnl substituted.
 dnl "cxx" can be used to indicate that a C++ shared module is desired.
 dnl "zend_ext" indicates a zend extension.
 AC_DEFUN([PHP_NEW_EXTENSION],[
-  ext_builddir=[]PHP_EXT_BUILDDIR()
-  ext_srcdir=[]PHP_EXT_SRCDIR()
-  ext_dir=[]PHP_EXT_DIR()
-
   ifelse($5,,ac_extra=,[ac_extra=$(echo "m4_normalize(m4_expand([$5]))"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g)])
 
   if test "$3" != "shared" && test "$3" != "yes" && test "$4" != "cli"; then

ext/hash/config.m4

@@ -31,7 +31,7 @@ AS_VAR_IF([ac_cv_c_bigendian_php], [yes], [
   ])
   EXT_HASH_SHA3_SOURCES="$SHA3_OPT_SRC $SHA3_DIR/KeccakHash.c $SHA3_DIR/KeccakSponge.c"
   PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
-  PHP_ADD_BUILD_DIR([PHP_EXT_BUILDDIR()/$SHA3_DIR])
+  PHP_ADD_BUILD_DIR([$ext_builddir/$SHA3_DIR])
 ])
 
 PHP_NEW_EXTENSION([hash], m4_normalize([
@@ -59,7 +59,7 @@ PHP_NEW_EXTENSION([hash], m4_normalize([
   ]),
   [no],,
   [$PHP_HASH_CFLAGS])
-PHP_ADD_BUILD_DIR([PHP_EXT_BUILDDIR()/murmur])
+PHP_ADD_BUILD_DIR([$ext_builddir/murmur])
 PHP_INSTALL_HEADERS([ext/hash], m4_normalize([
   php_hash_adler32.h
   php_hash_crc32.h

ext/mbstring/config.m4

@@ -81,11 +81,11 @@ dnl
 dnl Setup the required bundled libmbfl.
 dnl
 AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [
-  PHP_ADD_BUILD_DIR([PHP_EXT_BUILDDIR()/libmbfl], [1])
+  PHP_ADD_BUILD_DIR([$ext_builddir/libmbfl], [1])
   PHP_ADD_BUILD_DIR([
-    PHP_EXT_BUILDDIR()/libmbfl/filters
-    PHP_EXT_BUILDDIR()/libmbfl/mbfl
-    PHP_EXT_BUILDDIR()/libmbfl/nls
+    $ext_builddir/libmbfl/filters
+    $ext_builddir/libmbfl/mbfl
+    $ext_builddir/libmbfl/nls
   ])
   PHP_MBSTRING_ADD_INCLUDE([libmbfl])
   PHP_MBSTRING_ADD_INCLUDE([libmbfl/mbfl])

ext/opcache/config.m4

@@ -104,8 +104,8 @@ if test "$PHP_OPCACHE" != "no"; then
     AS_VAR_IF([ZEND_DEBUG], [yes], [JIT_CFLAGS="$JIT_CFLAGS -DIR_DEBUG"])
 
     PHP_ADD_BUILD_DIR([
-      PHP_EXT_BUILDDIR()/jit
-      PHP_EXT_BUILDDIR()/jit/ir
+      $ext_builddir/jit
+      $ext_builddir/jit/ir
     ])
   ])
 

scripts/phpize.m4

@@ -16,18 +16,20 @@ AC_CONFIG_AUX_DIR([build])
 AC_PRESERVE_HELP_ORDER
 
 PHP_CONFIG_NICE([config.nice])
+PHP_INIT_BUILD_SYSTEM
 
-AC_DEFUN([PHP_EXT_BUILDDIR],[.])dnl
-AC_DEFUN([PHP_EXT_DIR],[""])dnl
-AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir])dnl
-AC_DEFUN([PHP_ALWAYS_SHARED],[
+ext_builddir=.
+ext_dir=""
+ext_srcdir=$abs_srcdir
+AC_DEFUN([PHP_EXT_BUILDDIR], [$ext_builddir])dnl
+AC_DEFUN([PHP_EXT_DIR], [$ext_dir])dnl
+AC_DEFUN([PHP_EXT_SRCDIR], [$ext_srcdir])dnl
+AC_DEFUN([PHP_ALWAYS_SHARED], [
   ext_output="yes, shared"
   ext_shared=yes
   test "[$]$1" = "no" && $1=yes
 ])dnl
 
-PHP_INIT_BUILD_SYSTEM
-
 PKG_PROG_PKG_CONFIG
 AC_PROG_CC([cc gcc])
 PHP_DETECT_ICC