Skip to content

Commit d59691c

Browse files
authored
Autotools: Move php_shtool variable initialization to PHP_INIT_BUILD_SYSTEM (#14904)
As this script is still needed across the PHP build system its path can be also set on once place for both phpize usage and regular php-src's configure.ac.
1 parent 17cf7b3 commit d59691c

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

build/php.m4

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,9 @@ dnl PHP_INIT_BUILD_SYSTEM
124124
dnl
125125
dnl Creates build directories and Makefile placeholders.
126126
dnl
127-
AC_DEFUN([PHP_INIT_BUILD_SYSTEM],[
128-
AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
127+
AC_DEFUN([PHP_INIT_BUILD_SYSTEM],
128+
[AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
129+
php_shtool=$srcdir/build/shtool
129130
> Makefile.objects
130131
> Makefile.fragments
131132
dnl Run at the end of the configuration, before creating the config.status.

configure.ac

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,11 @@ fi
104104
dnl Settings we want to make before the checks.
105105
dnl ----------------------------------------------------------------------------
106106

107-
php_shtool=$srcdir/build/shtool
107+
PHP_INIT_BUILD_SYSTEM
108+
108109
T_MD=`$php_shtool echo -n -e %B`
109110
T_ME=`$php_shtool echo -n -e %b`
110111

111-
PHP_INIT_BUILD_SYSTEM
112-
113112
dnl We want this one before the checks, so the checks can modify CFLAGS.
114113
AS_VAR_IF([CFLAGS],, [auto_cflags=1])
115114

scripts/phpize.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`
6565
AS_VAR_IF([prefix],,
6666
[AC_MSG_ERROR([Cannot find php-config. Please use --with-php-config=PATH])])
6767

68-
php_shtool=$srcdir/build/shtool
6968
PHP_INIT_BUILD_SYSTEM
7069

7170
AC_MSG_CHECKING([for PHP prefix])

0 commit comments

Comments
 (0)