Skip to content

Commit 75c7974

Browse files
petkpetk
authored
Autotools: Replace backticks with $(...) in php.m4 (#15642)
This is a follow-up of GH-15639
1 parent fc01e2e commit 75c7974

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

‎build/php.m4

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ dnl Execute code, if variable is not set in namespace.
4040
dnl
4141
AC_DEFUN([PHP_RUN_ONCE],[
4242
changequote({,})
43-
unique=`echo $2|$SED 's/[^a-zA-Z0-9]/_/g'`
43+
unique=$(echo $2|$SED 's/[^a-zA-Z0-9]/_/g')
4444
changequote([,])
4545
cmd="echo $ac_n \"\$$1$unique$ac_c\""
46-
if test -n "$unique" && test "`eval $cmd`" = "" ; then
46+
if test -n "$unique" && test "$(eval $cmd)" = "" ; then
4747
eval "$1$unique=set"
4848
$3
4949
fi
@@ -59,10 +59,10 @@ AC_DEFUN([PHP_EXPAND_PATH],[
5959
$2=$1
6060
else
6161
changequote({,})
62-
ep_dir=`echo $1|$SED 's%/*[^/][^/]*/*$%%'`
62+
ep_dir=$(echo $1|$SED 's%/*[^/][^/]*/*$%%')
6363
changequote([,])
64-
ep_realdir=`(cd "$ep_dir" && pwd)`
65-
$2="$ep_realdir"/`basename "$1"`
64+
ep_realdir=$(cd "$ep_dir" && pwd)
65+
$2="$ep_realdir"/$(basename "$1")
6666
fi
6767
])
6868

@@ -248,7 +248,7 @@ dnl Relative to source- or build-directory?
248248
dnl ac_srcdir/ac_bdir include trailing slash
249249
case $1 in
250250
""[)] ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
251-
/*[)] ac_srcdir=`echo "$1"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
251+
/*[)] ac_srcdir=$(echo "$1"|cut -c 2-)"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
252252
*[)] ac_srcdir="$abs_srcdir/$1/"; ac_bdir="$1/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
253253
esac
254254
@@ -334,7 +334,7 @@ dnl Stores the location of libgcc in libgcc_libpath.
334334
dnl
335335
AC_DEFUN([PHP_LIBGCC_LIBPATH],[
336336
changequote({,})
337-
libgcc_libpath=`$1 --print-libgcc-file-name|$SED 's%/*[^/][^/]*$%%'`
337+
libgcc_libpath=$($1 --print-libgcc-file-name|$SED 's%/*[^/][^/]*$%%')
338338
changequote([,])
339339
])
340340

@@ -386,11 +386,11 @@ AC_DEFUN([PHP_EVAL_LIBLINE],
386386
fi
387387
;;
388388
-l*[)]
389-
ac_ii=`echo $ac_i|cut -c 3-`
389+
ac_ii=$(echo $ac_i|cut -c 3-)
390390
PHP_ADD_LIBRARY($ac_ii,1,$2)
391391
;;
392392
-L*[)]
393-
ac_ii=`echo $ac_i|cut -c 3-`
393+
ac_ii=$(echo $ac_i|cut -c 3-)
394394
PHP_ADD_LIBPATH($ac_ii,$2)
395395
;;
396396
esac
@@ -408,7 +408,7 @@ AC_DEFUN([PHP_EVAL_INCLINE],[
408408
for ac_i in $1; do
409409
case $ac_i in
410410
-I*[)]
411-
ac_ii=`echo $ac_i|cut -c 3-`
411+
ac_ii=$(echo $ac_i|cut -c 3-)
412412
PHP_ADD_INCLUDE([$ac_ii])
413413
;;
414414
esac
@@ -662,7 +662,7 @@ ext_output="yes, shared"
662662
ext_shared=yes
663663
case [$]$1 in
664664
shared,*[)]
665-
$1=`echo "[$]$1"|$SED 's/^shared,//'`
665+
$1=$(echo "[$]$1"|$SED 's/^shared,//')
666666
;;
667667
shared[)]
668668
$1=yes
@@ -953,7 +953,7 @@ AC_DEFUN([PHP_NEW_EXTENSION],[
953953
ext_srcdir=[]PHP_EXT_SRCDIR()
954954
ext_dir=[]PHP_EXT_DIR()
955955
956-
ifelse($5,,ac_extra=,[ac_extra=`echo "$5"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`])
956+
ifelse($5,,ac_extra=,[ac_extra=$(echo "$5"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g)])
957957
958958
if test "$3" != "shared" && test "$3" != "yes" && test "$4" != "cli"; then
959959
dnl ---------------------------------------------- Static module
@@ -1066,7 +1066,7 @@ int main(void)
10661066
return(0);
10671067
}
10681068
])], [
1069-
eval $php_cache_value=`cat conftestval`
1069+
eval $php_cache_value=$(cat conftestval)
10701070
], [
10711071
eval $php_cache_value=0
10721072
], [
@@ -1309,7 +1309,7 @@ dnl component of the path has execute but not read permissions.
13091309
dnl
13101310
AC_DEFUN([PHP_BROKEN_GETCWD],[
13111311
AC_MSG_CHECKING([for broken getcwd])
1312-
os=`uname -sr 2>/dev/null`
1312+
os=$(uname -sr 2>/dev/null)
13131313
case $os in
13141314
SunOS*[)]
13151315
AC_DEFINE([HAVE_BROKEN_GETCWD], [1],
@@ -1324,7 +1324,7 @@ dnl
13241324
dnl PHP_BROKEN_GCC_STRLEN_OPT
13251325
dnl
13261326
dnl Early releases of GCC 8 shipped with a strlen() optimization bug, so they
1327-
dnl didn't properly handle the `char val[1]` struct hack. See bug #76510.
1327+
dnl didn't properly handle the 'char val[1]' struct hack. See bug #76510.
13281328
dnl
13291329
AC_DEFUN([PHP_BROKEN_GCC_STRLEN_OPT],
13301330
[AC_CACHE_CHECK([for broken gcc optimize-strlen],
@@ -1684,7 +1684,7 @@ AC_DEFUN([PHP_PROG_BISON], [
16841684
ac_IFS=$IFS; IFS="."
16851685
set $php_bison_version
16861686
IFS=$ac_IFS
1687-
php_bison_num=`expr [$]{1:-0} \* 10000 + [$]{2:-0} \* 100 + [$]{3:-0}`
1687+
php_bison_num=$(expr [$]{1:-0} \* 10000 + [$]{2:-0} \* 100 + [$]{3:-0})
16881688
php_bison_branch="[$]1.[$]2"
16891689
php_bison_check=ok
16901690
@@ -1694,7 +1694,7 @@ AC_DEFUN([PHP_PROG_BISON], [
16941694
ac_IFS=$IFS; IFS="."
16951695
set $php_bison_required_version
16961696
IFS=$ac_IFS
1697-
php_bison_required_num=`expr [$]{1:-0} \* 10000 + [$]{2:-0} \* 100 + [$]{3:-0}`
1697+
php_bison_required_num=$(expr [$]{1:-0} \* 10000 + [$]{2:-0} \* 100 + [$]{3:-0})
16981698
php_bison_required_version="$php_bison_required_version or later"
16991699
17001700
if test -z "$php_bison_num" || test "$php_bison_num" -lt "$php_bison_required_num"; then
@@ -2065,14 +2065,14 @@ dnl This macro is used to get a comparable version for Apache.
20652065
dnl
20662066
AC_DEFUN([PHP_AP_EXTRACT_VERSION],[
20672067
AS_IF([test -x "$1"], [
2068-
ac_output=`$1 -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'`
2068+
ac_output=$($1 -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//')
20692069
ac_IFS=$IFS
20702070
IFS="- /.
20712071
"
20722072
set $ac_output
20732073
IFS=$ac_IFS
20742074
2075-
APACHE_VERSION=`expr [$]4 \* 1000000 + [$]5 \* 1000 + [$]6`
2075+
APACHE_VERSION=$(expr [$]4 \* 1000000 + [$]5 \* 1000 + [$]6)
20762076
])
20772077
])
20782078

@@ -2101,27 +2101,27 @@ EOF
21012101
eval val=\$$var
21022102
if test -n "$val"; then
21032103
echo "$var='$val' \\" >> $1
2104-
if test `expr "X$ac_configure_args" : ".*${var}.*"` != 0; then
2104+
if test $(expr "X$ac_configure_args" : ".*${var}.*") != 0; then
21052105
clean_configure_args=$(echo $clean_configure_args | $SED -e "s#'$var=$val'##")
21062106
fi
21072107
fi
21082108
done
21092109
21102110
echo "'[$]0' \\" >> $1
2111-
if test `expr " [$]0" : " '.*"` = 0; then
2111+
if test $(expr " [$]0" : " '.*") = 0; then
21122112
CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]0'"
21132113
else
21142114
CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]0"
21152115
fi
21162116
CONFIGURE_ARGS="$clean_configure_args"
21172117
while test "X$CONFIGURE_ARGS" != "X";
21182118
do
2119-
if CURRENT_ARG=`expr "X$CONFIGURE_ARGS" : "X *\('[[^']]*'\)"`
2119+
if CURRENT_ARG=$(expr "X$CONFIGURE_ARGS" : "X *\('[[^']]*'\)")
21202120
then
2121-
CONFIGURE_ARGS=`expr "X$CONFIGURE_ARGS" : "X *'[[^']]*' \(.*\)"`
2122-
elif CURRENT_ARG=`expr "X$CONFIGURE_ARGS" : "X *\([[^ ]]*\)"`
2121+
CONFIGURE_ARGS=$(expr "X$CONFIGURE_ARGS" : "X *'[[^']]*' \(.*\)")
2122+
elif CURRENT_ARG=$(expr "X$CONFIGURE_ARGS" : "X *\([[^ ]]*\)")
21232123
then
2124-
CONFIGURE_ARGS=`expr "X$CONFIGURE_ARGS" : "X *[[^ ]]* \(.*\)"`
2124+
CONFIGURE_ARGS=$(expr "X$CONFIGURE_ARGS" : "X *[[^ ]]* \(.*\)")
21252125
CURRENT_ARG="'$CURRENT_ARG'"
21262126
else
21272127
break
@@ -2300,7 +2300,7 @@ AC_DEFUN([PHP_INIT_DTRACE],
23002300
dnl Set paths properly when called from extension.
23012301
case "$4" in
23022302
""[)] ac_srcdir="$abs_srcdir/"; unset ac_bdir;;
2303-
/*[)] ac_srcdir=`echo "$4"|cut -c 2-`"/"; ac_bdir=$ac_srcdir;;
2303+
/*[)] ac_srcdir=$(echo "$4"|cut -c 2-)"/"; ac_bdir=$ac_srcdir;;
23042304
*[)] ac_srcdir="$abs_srcdir/$1/"; ac_bdir="$4/";;
23052305
esac
23062306
@@ -2343,7 +2343,7 @@ dnl DTrace objects.
23432343
case [$]php_sapi_module in
23442344
shared[)]
23452345
for ac_lo in $PHP_DTRACE_OBJS; do
2346-
dtrace_objs="[$]dtrace_objs `echo $ac_lo | $SED -e 's,\.lo$,.o,' -e 's#\(.*\)\/#\1\/.libs\/#'`"
2346+
dtrace_objs="[$]dtrace_objs $(echo $ac_lo | $SED -e 's,\.lo$,.o,' -e 's#\(.*\)\/#\1\/.libs\/#')"
23472347
done;
23482348
;;
23492349
*[)]
@@ -2367,12 +2367,12 @@ EOF
23672367
23682368
case $host_alias in
23692369
*solaris*|*linux*|*freebsd*)
2370-
dtrace_prov_name="`echo $ac_provsrc | $SED -e 's#\(.*\)\/##'`.o"
2371-
dtrace_lib_dir="`echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/[^/]*#\1#'`/.libs"
2372-
dtrace_d_obj="`echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/\([^/]*\)#\1/.libs/\2#'`.o"
2370+
dtrace_prov_name="$(echo $ac_provsrc | $SED -e 's#\(.*\)\/##').o"
2371+
dtrace_lib_dir="$(echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/[^/]*#\1#')/.libs"
2372+
dtrace_d_obj="$(echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/\([^/]*\)#\1/.libs/\2#').o"
23732373
dtrace_nolib_objs='$(PHP_DTRACE_OBJS:.lo=.o)'
23742374
for ac_lo in $PHP_DTRACE_OBJS; do
2375-
dtrace_lib_objs="[$]dtrace_lib_objs `echo $ac_lo | $SED -e 's,\.lo$,.o,' -e 's#\(.*\)\/#\1\/.libs\/#'`"
2375+
dtrace_lib_objs="[$]dtrace_lib_objs $(echo $ac_lo | $SED -e 's,\.lo$,.o,' -e 's#\(.*\)\/#\1\/.libs\/#')"
23762376
done;
23772377
dnl Always attempt to create both PIC and non-PIC DTrace objects (Bug 63692)
23782378
cat>>Makefile.objects<<EOF

0 commit comments

Comments
 (0)