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: Sync CS in phpize and configure.ac (#14838)

Browse source 
- This syncs Autoconf syntax with AS_VAR_* macros in phpize and
  configure.ac
- The cross-compiling check synced with configure.ac (the check message
  printed after program check message)
- Some redundant quoting removed
This commit is contained in:
Peter Kokot 2024-07-06 13:35:14 +02:00 • committed by GitHub
parent e4904a2199
commit 17ef4b7ced
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
configure.ac
View file

@ -112,7 +112,7 @@ T_ME=`$php_shtool echo -n -e %b`
PHP_INIT_BUILD_SYSTEM 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.
test -z "$CFLAGS" && auto_cflags=1 AS_VAR_SET_IF([CFLAGS],, [auto_cflags=1])
abs_srcdir=`(cd $srcdir; pwd)` abs_srcdir=`(cd $srcdir; pwd)`
abs_builddir=`pwd` abs_builddir=`pwd`
@ -1349,10 +1349,10 @@ unset LIBS LDFLAGS
AC_ARG_PROGRAM AC_ARG_PROGRAM
test "$prefix" = "NONE" && prefix=/usr/local AS_VAR_IF([prefix], [NONE], [prefix=/usr/local])
test "$exec_prefix" = "NONE" && exec_prefix='${prefix}' AS_VAR_IF([exec_prefix], [NONE], [exec_prefix='${prefix}'])
test "$program_prefix" = "NONE" && program_prefix= AS_VAR_IF([program_prefix], [NONE], [program_prefix=])
test "$program_suffix" = "NONE" && program_suffix= AS_VAR_IF([program_suffix], [NONE], [program_suffix=])
orig_libdir=$libdir orig_libdir=$libdir
case $libdir in case $libdir in

23
scripts/phpize.m4
View file

@ -26,7 +26,7 @@ AC_DEFUN([PHP_ALWAYS_SHARED],[
test "[$]$1" = "no" && $1=yes test "[$]$1" = "no" && $1=yes
])dnl ])dnl
test -z "$CFLAGS" && auto_cflags=1 AS_VAR_SET_IF([CFLAGS],, [auto_cflags=1])
abs_srcdir=`(cd $srcdir && pwd)` abs_srcdir=`(cd $srcdir && pwd)`
abs_builddir=`pwd` abs_builddir=`pwd`
@ -62,9 +62,8 @@ INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null` EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null`
PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null` PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`
if test -z "$prefix"; then AS_VAR_SET_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])])
fi
php_shtool=$srcdir/build/shtool php_shtool=$srcdir/build/shtool
PHP_INIT_BUILD_SYSTEM PHP_INIT_BUILD_SYSTEM
@ -167,16 +166,14 @@ CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H"
CFLAGS_CLEAN='$(CFLAGS) -D_GNU_SOURCE' CFLAGS_CLEAN='$(CFLAGS) -D_GNU_SOURCE'
CXXFLAGS_CLEAN='$(CXXFLAGS)' CXXFLAGS_CLEAN='$(CXXFLAGS)'
test "$prefix" = "NONE" && prefix="/usr/local" AS_VAR_IF([prefix], [NONE], [prefix=/usr/local])
test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)' AS_VAR_IF([exec_prefix], [NONE], [exec_prefix='$(prefix)'])
if test "$cross_compiling" = yes ; then AS_VAR_IF([cross_compiling], [yes],
AC_MSG_CHECKING(for native build C compiler) [AC_CHECK_PROGS([BUILD_CC], [gcc clang c99 c89 cc cl], [none])
AC_CHECK_PROGS(BUILD_CC, [gcc clang c99 c89 cc cl],none) AC_MSG_CHECKING([for native build C compiler])
AC_MSG_RESULT($BUILD_CC) AC_MSG_RESULT([$BUILD_CC])],
else [BUILD_CC=$CC])
BUILD_CC=$CC
fi
PHP_SUBST([PHP_MODULES]) PHP_SUBST([PHP_MODULES])
PHP_SUBST([PHP_ZEND_EX]) PHP_SUBST([PHP_ZEND_EX])