@@ -31,25 +31,23 @@ if test "$PHP_APXS2" != "no"; then
31
31
AC_MSG_ERROR ( [ Aborting] )
32
32
fi
33
33
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)
36
36
AS_IF ( [ test ! -x "$APXS_HTTPD"] , [ AC_MSG_ERROR ( m4_text_wrap ( [
37
37
$APXS_HTTPD executable not found. Please, install Apache HTTP Server
38
38
command-line utility.
39
39
] ) ) ] )
40
40
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)
44
44
45
45
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)
50
48
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) "
53
51
54
52
for flag in $APXS_CFLAGS; do
55
53
AS_CASE ( [ $flag] , [ -D*] , [ APACHE_CPPFLAGS="$APACHE_CPPFLAGS $flag"] )
@@ -62,13 +60,13 @@ if test "$PHP_APXS2" != "no"; then
62
60
AS_VERSION_COMPARE ( [ $APACHE_VERSION] , [ 2004000] ,
63
61
[ AC_MSG_ERROR ( [ Please note that Apache version >= 2.4 is required] ) ] )
64
62
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
67
65
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
68
66
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
69
67
-i -n php"
70
68
else
71
- APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$ APXS -q SYSCONFDIR`
69
+ APXS_SYSCONFDIR='$(INSTALL_ROOT)'$($ APXS -q SYSCONFDIR)
72
70
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
73
71
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
74
72
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
@@ -91,10 +89,10 @@ if test "$PHP_APXS2" != "no"; then
91
89
dnl its dependencies. Therefore, we must pull in the APR and APR-util
92
90
dnl libraries.
93
91
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) "
95
93
fi
96
94
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"
98
96
fi
99
97
MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
100
98
PHP_SUBST([ MH_BUNDLE_FLAGS] )
0 commit comments