Skip to content

Commit b2640ee

Browse files
authored
Autotools: Replace obsolete backticks with $(...) in apache2handler (php#15454)
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).
1 parent b86dfd7 commit b2640ee

File tree

1 file changed

+14
-16
lines changed

1 file changed

+14
-16
lines changed

sapi/apache2handler/config.m4

+14-16
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,23 @@ if test "$PHP_APXS2" != "no"; then
3131
AC_MSG_ERROR([Aborting])
3232
fi
3333

34-
APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
35-
APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
34+
APXS_INCLUDEDIR=$($APXS -q INCLUDEDIR)
35+
APXS_HTTPD=$($APXS -q SBINDIR)/$($APXS -q TARGET)
3636
AS_IF([test ! -x "$APXS_HTTPD"], [AC_MSG_ERROR(m4_text_wrap([
3737
$APXS_HTTPD executable not found. Please, install Apache HTTP Server
3838
command-line utility.
3939
]))])
4040

41-
APXS_CFLAGS=`$APXS -q CFLAGS`
42-
APU_BINDIR=`$APXS -q APU_BINDIR`
43-
APR_BINDIR=`$APXS -q APR_BINDIR`
41+
APXS_CFLAGS=$($APXS -q CFLAGS)
42+
APU_BINDIR=$($APXS -q APU_BINDIR)
43+
APR_BINDIR=$($APXS -q APR_BINDIR)
4444

4545
dnl Pick up ap[ru]-N-config.
46-
APR_CONFIG=`$APXS -q APR_CONFIG 2>/dev/null ||
47-
echo $APR_BINDIR/apr-config`
48-
APU_CONFIG=`$APXS -q APU_CONFIG 2>/dev/null ||
49-
echo $APU_BINDIR/apu-config`
46+
APR_CONFIG=$($APXS -q APR_CONFIG 2>/dev/null || echo $APR_BINDIR/apr-config)
47+
APU_CONFIG=$($APXS -q APU_CONFIG 2>/dev/null || echo $APU_BINDIR/apu-config)
5048

51-
APR_CFLAGS="`$APR_CONFIG --cppflags --includes`"
52-
APU_CFLAGS="`$APU_CONFIG --includes`"
49+
APR_CFLAGS="$($APR_CONFIG --cppflags --includes)"
50+
APU_CFLAGS="$($APU_CONFIG --includes)"
5351

5452
for flag in $APXS_CFLAGS; do
5553
AS_CASE([$flag], [-D*], [APACHE_CPPFLAGS="$APACHE_CPPFLAGS $flag"])
@@ -62,13 +60,13 @@ if test "$PHP_APXS2" != "no"; then
6260
AS_VERSION_COMPARE([$APACHE_VERSION], [2004000],
6361
[AC_MSG_ERROR([Please note that Apache version >= 2.4 is required])])
6462

65-
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
66-
if test -z `$APXS -q SYSCONFDIR`; then
63+
APXS_LIBEXECDIR='$(INSTALL_ROOT)'$($APXS -q LIBEXECDIR)
64+
if test -z $($APXS -q SYSCONFDIR); then
6765
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
6866
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
6967
-i -n php"
7068
else
71-
APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
69+
APXS_SYSCONFDIR='$(INSTALL_ROOT)'$($APXS -q SYSCONFDIR)
7270
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
7371
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
7472
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
@@ -91,10 +89,10 @@ if test "$PHP_APXS2" != "no"; then
9189
dnl its dependencies. Therefore, we must pull in the APR and APR-util
9290
dnl libraries.
9391
if test -x "$APR_CONFIG"; then
94-
MH_BUNDLE_FLAGS="`$APR_CONFIG --ldflags --link-ld --libs`"
92+
MH_BUNDLE_FLAGS="$($APR_CONFIG --ldflags --link-ld --libs)"
9593
fi
9694
if test -x "$APU_CONFIG"; then
97-
MH_BUNDLE_FLAGS="`$APU_CONFIG --ldflags --link-ld --libs` $MH_BUNDLE_FLAGS"
95+
MH_BUNDLE_FLAGS="$($APU_CONFIG --ldflags --link-ld --libs) $MH_BUNDLE_FLAGS"
9896
fi
9997
MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
10098
PHP_SUBST([MH_BUNDLE_FLAGS])

0 commit comments

Comments
 (0)