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: Replace obsolete backticks with $(...) in apache2handler (#15454)

Browse source 
Obsolete backticks can be replaced with the recommended $(...) (on
shells where the "newer" style still doesn't work, for example, on
Solaris 10 default shell, Autoconf takes care of that by re-executing
the script itself).
This commit is contained in:
Peter Kokot 2024-08-17 14:37:32 +02:00 • committed by GitHub
parent b86dfd76a2
commit b2640ee7f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
sapi/apache2handler/config.m4
View file

@ -31,25 +31,23 @@ if test "$PHP_APXS2" != "no"; then
AC_MSG_ERROR([Aborting]) AC_MSG_ERROR([Aborting])
fi fi
APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR` APXS_INCLUDEDIR=$($APXS -q INCLUDEDIR)
APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET` APXS_HTTPD=$($APXS -q SBINDIR)/$($APXS -q TARGET)
AS_IF([test ! -x "$APXS_HTTPD"], [AC_MSG_ERROR(m4_text_wrap([ AS_IF([test ! -x "$APXS_HTTPD"], [AC_MSG_ERROR(m4_text_wrap([
$APXS_HTTPD executable not found. Please, install Apache HTTP Server $APXS_HTTPD executable not found. Please, install Apache HTTP Server
command-line utility. command-line utility.
]))]) ]))])
APXS_CFLAGS=`$APXS -q CFLAGS` APXS_CFLAGS=$($APXS -q CFLAGS)
APU_BINDIR=`$APXS -q APU_BINDIR` APU_BINDIR=$($APXS -q APU_BINDIR)
APR_BINDIR=`$APXS -q APR_BINDIR` APR_BINDIR=$($APXS -q APR_BINDIR)
dnl Pick up ap[ru]-N-config. dnl Pick up ap[ru]-N-config.
APR_CONFIG=`$APXS -q APR_CONFIG 2>/dev/null || APR_CONFIG=$($APXS -q APR_CONFIG 2>/dev/null || echo $APR_BINDIR/apr-config)
echo $APR_BINDIR/apr-config` APU_CONFIG=$($APXS -q APU_CONFIG 2>/dev/null || echo $APU_BINDIR/apu-config)
APU_CONFIG=`$APXS -q APU_CONFIG 2>/dev/null ||
echo $APU_BINDIR/apu-config`
APR_CFLAGS="`$APR_CONFIG --cppflags --includes`" APR_CFLAGS="$($APR_CONFIG --cppflags --includes)"
APU_CFLAGS="`$APU_CONFIG --includes`" APU_CFLAGS="$($APU_CONFIG --includes)"
for flag in $APXS_CFLAGS; do for flag in $APXS_CFLAGS; do
AS_CASE([$flag], [-D*], [APACHE_CPPFLAGS="$APACHE_CPPFLAGS $flag"]) AS_CASE([$flag], [-D*], [APACHE_CPPFLAGS="$APACHE_CPPFLAGS $flag"])
@ -62,13 +60,13 @@ if test "$PHP_APXS2" != "no"; then
AS_VERSION_COMPARE([$APACHE_VERSION], [2004000], AS_VERSION_COMPARE([$APACHE_VERSION], [2004000],
[AC_MSG_ERROR([Please note that Apache version >= 2.4 is required])]) [AC_MSG_ERROR([Please note that Apache version >= 2.4 is required])])
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` APXS_LIBEXECDIR='$(INSTALL_ROOT)'$($APXS -q LIBEXECDIR)
if test -z `$APXS -q SYSCONFDIR`; then if test -z $($APXS -q SYSCONFDIR); then
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-i -n php" -i -n php"
else else
APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` APXS_SYSCONFDIR='$(INSTALL_ROOT)'$($APXS -q SYSCONFDIR)
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
@ -91,10 +89,10 @@ if test "$PHP_APXS2" != "no"; then
dnl its dependencies. Therefore, we must pull in the APR and APR-util dnl its dependencies. Therefore, we must pull in the APR and APR-util
dnl libraries. dnl libraries.
if test -x "$APR_CONFIG"; then if test -x "$APR_CONFIG"; then
MH_BUNDLE_FLAGS="`$APR_CONFIG --ldflags --link-ld --libs`" MH_BUNDLE_FLAGS="$($APR_CONFIG --ldflags --link-ld --libs)"
fi fi
if test -x "$APU_CONFIG"; then if test -x "$APU_CONFIG"; then
MH_BUNDLE_FLAGS="`$APU_CONFIG --ldflags --link-ld --libs` $MH_BUNDLE_FLAGS" MH_BUNDLE_FLAGS="$($APU_CONFIG --ldflags --link-ld --libs) $MH_BUNDLE_FLAGS"
fi fi
MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS" MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
PHP_SUBST([MH_BUNDLE_FLAGS]) PHP_SUBST([MH_BUNDLE_FLAGS])