Autotools: Simplify few PHP_ADD_BUILD_DIR calls

The $ext_builddir variable for the current extension is set after the
PHP_NEW_EXTENSION is called. But there is also PHP_EXT_BUILDDIR macro
which expands to the same value (defined in config-stubs and phpize),
a relative path of the current extension or SAPI. This enables calling
PHP_ADD_BUILD_DIR before the PHP_NEW_EXTENSION and removes some
redundant conditions.

Author: petk

ext/hash/config.m4

@@ -13,7 +13,6 @@ AS_VAR_IF([ac_cv_c_bigendian_php], [yes], [
   AC_DEFINE([HAVE_SLOW_HASH3], [1],
     [Define to 1 if the PHP hash extension uses the slow SHA3 algorithm.])
   AC_MSG_WARN([Using SHA3 slow implementation on bigendian])
-  SHA3_DIR=
 ], [
   AC_CHECK_SIZEOF([long])
   AC_MSG_CHECKING([if we're at 64-bit platform])
@@ -32,6 +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_NEW_EXTENSION([hash], m4_normalize([
@@ -59,8 +59,7 @@ PHP_NEW_EXTENSION([hash], m4_normalize([
   ]),
   [no],,
   [$PHP_HASH_CFLAGS])
-PHP_ADD_BUILD_DIR([$ext_builddir/murmur])
-AS_VAR_IF([SHA3_DIR],,, [PHP_ADD_BUILD_DIR([$ext_builddir/$SHA3_DIR])])
+PHP_ADD_BUILD_DIR([PHP_EXT_BUILDDIR()/murmur])
 PHP_INSTALL_HEADERS([ext/hash], m4_normalize([
   php_hash_adler32.h
   php_hash_crc32.h

ext/mbstring/config.m4

@@ -6,10 +6,6 @@ AC_DEFUN([PHP_MBSTRING_ADD_BASE_SOURCES], [
   PHP_MBSTRING_BASE_SOURCES="$PHP_MBSTRING_BASE_SOURCES $1"
 ])
 
-AC_DEFUN([PHP_MBSTRING_ADD_BUILD_DIR], [
-  PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS $1"
-])
-
 AC_DEFUN([PHP_MBSTRING_ADD_INCLUDE], [
   PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES $1"
 ])
@@ -25,10 +21,6 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [
     [$PHP_MBSTRING_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
   PHP_SUBST([MBSTRING_SHARED_LIBADD])
 
-  for dir in $PHP_MBSTRING_EXTRA_BUILD_DIRS; do
-    PHP_ADD_BUILD_DIR([$ext_builddir/$dir], [1])
-  done
-
   for dir in $PHP_MBSTRING_EXTRA_INCLUDES; do
     PHP_ADD_INCLUDE([$ext_srcdir/$dir])
     PHP_ADD_INCLUDE([$ext_builddir/$dir])
@@ -83,14 +75,18 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [
   fi
 ])
 
+dnl
+dnl PHP_MBSTRING_SETUP_LIBMBFL
+dnl
+dnl Setup the required bundled libmbfl.
+dnl
 AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [
-  dnl
-  dnl Bundled libmbfl is required and can not be disabled
-  dnl
-  PHP_MBSTRING_ADD_BUILD_DIR([libmbfl])
-  PHP_MBSTRING_ADD_BUILD_DIR([libmbfl/mbfl])
-  PHP_MBSTRING_ADD_BUILD_DIR([libmbfl/filters])
-  PHP_MBSTRING_ADD_BUILD_DIR([libmbfl/nls])
+  PHP_ADD_BUILD_DIR([PHP_EXT_BUILDDIR()/libmbfl], [1])
+  PHP_ADD_BUILD_DIR([
+    PHP_EXT_BUILDDIR()/libmbfl/filters
+    PHP_EXT_BUILDDIR()/libmbfl/mbfl
+    PHP_EXT_BUILDDIR()/libmbfl/nls
+  ])
   PHP_MBSTRING_ADD_INCLUDE([libmbfl])
   PHP_MBSTRING_ADD_INCLUDE([libmbfl/mbfl])
 

ext/opcache/config.m4

@@ -102,6 +102,11 @@ if test "$PHP_OPCACHE" != "no"; then
 
     JIT_CFLAGS="-I@ext_builddir@/jit/ir -D$IR_TARGET -DIR_PHP"
     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
+    ])
   ])
 
   AC_CHECK_FUNCS([mprotect shm_create_largepage])
@@ -353,12 +358,7 @@ int main(void) {
     ]))
   fi
 
-  AS_VAR_IF([PHP_OPCACHE_JIT], [yes], [
-    PHP_ADD_BUILD_DIR([
-      $ext_builddir/jit
-      $ext_builddir/jit/ir
-    ])
-    PHP_ADD_MAKEFILE_FRAGMENT([$ext_srcdir/jit/Makefile.frag])
-  ])
+  AS_VAR_IF([PHP_OPCACHE_JIT], [yes],
+    [PHP_ADD_MAKEFILE_FRAGMENT([$ext_srcdir/jit/Makefile.frag])])
   PHP_SUBST([OPCACHE_SHARED_LIBADD])
 fi