archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Autotools: Move php_shtool variable initialization to PHP_INIT_BUILD_SYSTEM (#14904)

Browse source 
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.
This commit is contained in:
Peter Kokot 2024-07-10 21:15:02 +02:00 • committed by GitHub
parent 17cf7b381a
commit d59691c02f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
build/php.m4
View file

@ -124,8 +124,9 @@ dnl PHP_INIT_BUILD_SYSTEM
dnl dnl
dnl Creates build directories and Makefile placeholders. dnl Creates build directories and Makefile placeholders.
dnl dnl
AC_DEFUN([PHP_INIT_BUILD_SYSTEM],[ AC_DEFUN([PHP_INIT_BUILD_SYSTEM],
AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl [AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
php_shtool=$srcdir/build/shtool
> Makefile.objects > Makefile.objects
> Makefile.fragments > Makefile.fragments
dnl Run at the end of the configuration, before creating the config.status. dnl Run at the end of the configuration, before creating the config.status.

5
configure.ac
View file

@ -104,12 +104,11 @@ fi
dnl Settings we want to make before the checks. dnl Settings we want to make before the checks.
dnl ---------------------------------------------------------------------------- dnl ----------------------------------------------------------------------------
php_shtool=$srcdir/build/shtool PHP_INIT_BUILD_SYSTEM
T_MD=`$php_shtool echo -n -e %B` T_MD=`$php_shtool echo -n -e %B`
T_ME=`$php_shtool echo -n -e %b` T_ME=`$php_shtool echo -n -e %b`
PHP_INIT_BUILD_SYSTEM
dnl We want this one before the checks, so the checks can modify CFLAGS. dnl We want this one before the checks, so the checks can modify CFLAGS.
AS_VAR_IF([CFLAGS],, [auto_cflags=1]) AS_VAR_IF([CFLAGS],, [auto_cflags=1])

1
scripts/phpize.m4
View file

@ -65,7 +65,6 @@ PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`
AS_VAR_IF([prefix],, AS_VAR_IF([prefix],,
[AC_MSG_ERROR([Cannot find php-config. Please use --with-php-config=PATH])]) [AC_MSG_ERROR([Cannot find php-config. Please use --with-php-config=PATH])])
php_shtool=$srcdir/build/shtool
PHP_INIT_BUILD_SYSTEM PHP_INIT_BUILD_SYSTEM
AC_MSG_CHECKING([for PHP prefix]) AC_MSG_CHECKING([for PHP prefix])