Skip to content

Commit a7f0fe1

Browse files
committed
Autotools: Quote macro arguments
- PHP_EXPAND_PATH - PHP_LIBGCC_LIBPATH - PHP_OUTPUT - PHP_REMOVE_USR_LIB
1 parent bb8d667 commit a7f0fe1

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

configure.ac

+3-3
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ PHP_ARG_ENABLE([libgcc],
948948
[no])
949949

950950
if test "$PHP_LIBGCC" = "yes"; then
951-
PHP_LIBGCC_LIBPATH(gcc)
951+
PHP_LIBGCC_LIBPATH([gcc])
952952
if test -z "$libgcc_libpath"; then
953953
AC_MSG_ERROR([Cannot locate libgcc. Make sure that gcc is in your path])
954954
fi
@@ -1437,8 +1437,8 @@ AC_SUBST([PHP_LDFLAGS])
14371437

14381438
PHP_UTILIZE_RPATHS
14391439

1440-
PHP_REMOVE_USR_LIB(PHP_LDFLAGS)
1441-
PHP_REMOVE_USR_LIB(LDFLAGS)
1440+
PHP_REMOVE_USR_LIB([PHP_LDFLAGS])
1441+
PHP_REMOVE_USR_LIB([LDFLAGS])
14421442

14431443
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
14441444
EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"

ext/phar/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ if test "$PHP_PHAR" != "no"; then
2323

2424
PHP_INSTALL_HEADERS([ext/phar], [php_phar.h])
2525

26-
PHP_OUTPUT(ext/phar/phar.1 ext/phar/phar.phar.1)
26+
PHP_OUTPUT([ext/phar/phar.1 ext/phar/phar.phar.1])
2727
fi

sapi/apache2handler/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if test "$PHP_APXS2" != "no"; then
1414
APXS=/usr/sbin/apxs
1515
fi
1616
else
17-
PHP_EXPAND_PATH($PHP_APXS2, APXS)
17+
PHP_EXPAND_PATH([$PHP_APXS2], [APXS])
1818
fi
1919

2020
$APXS -q CFLAGS >/dev/null 2>&1

sapi/cgi/config9.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ if test "$PHP_CGI" != "no"; then
5555
PHP_SUBST([SAPI_CGI_PATH])
5656
PHP_SUBST([BUILD_CGI])
5757

58-
PHP_OUTPUT(sapi/cgi/php-cgi.1)
58+
PHP_OUTPUT([sapi/cgi/php-cgi.1])
5959
fi

sapi/cli/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if test "$PHP_CLI" != "no"; then
5252
PHP_SUBST([SAPI_CLI_PATH])
5353
PHP_SUBST([BUILD_CLI])
5454

55-
PHP_OUTPUT(sapi/cli/php.1)
55+
PHP_OUTPUT([sapi/cli/php.1])
5656

5757
PHP_INSTALL_HEADERS([sapi/cli], [cli.h])
5858
fi

sapi/fpm/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ if test "$PHP_FPM" != "no"; then
508508

509509
PHP_ADD_BUILD_DIR([sapi/fpm/fpm])
510510
PHP_ADD_BUILD_DIR([sapi/fpm/fpm/events])
511-
PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/www.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html)
511+
PHP_OUTPUT([sapi/fpm/php-fpm.conf sapi/fpm/www.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html])
512512
PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag])
513513

514514
SAPI_FPM_PATH=sapi/fpm/php-fpm

sapi/phpdbg/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,5 +98,5 @@ if test "$PHP_PHPDBG" != "no"; then
9898
PHP_SUBST([BUILD_PHPDBG])
9999
PHP_SUBST([BUILD_PHPDBG_SHARED])
100100

101-
PHP_OUTPUT(sapi/phpdbg/phpdbg.1)
101+
PHP_OUTPUT([sapi/phpdbg/phpdbg.1])
102102
fi

0 commit comments

Comments
 (0)