@@ -1438,18 +1438,18 @@ exec_prefix=$old_exec_prefix
1438
1438
libdir=$old_libdir
1439
1439
datadir=$old_datadir
1440
1440
1441
- AC_SUBST ( INCLUDE_PATH )
1442
- AC_SUBST ( EXPANDED_PEAR_INSTALLDIR )
1443
- AC_SUBST ( EXPANDED_EXTENSION_DIR )
1444
- AC_SUBST ( EXPANDED_BINDIR )
1445
- AC_SUBST ( EXPANDED_SBINDIR )
1446
- AC_SUBST ( EXPANDED_MANDIR )
1447
- AC_SUBST ( EXPANDED_LIBDIR )
1448
- AC_SUBST ( EXPANDED_DATADIR )
1449
- AC_SUBST ( EXPANDED_SYSCONFDIR )
1450
- AC_SUBST ( EXPANDED_LOCALSTATEDIR )
1451
- AC_SUBST ( EXPANDED_PHP_CONFIG_FILE_PATH )
1452
- AC_SUBST ( EXPANDED_PHP_CONFIG_FILE_SCAN_DIR )
1441
+ AC_SUBST ( [ INCLUDE_PATH] )
1442
+ AC_SUBST ( [ EXPANDED_PEAR_INSTALLDIR] )
1443
+ AC_SUBST ( [ EXPANDED_EXTENSION_DIR] )
1444
+ AC_SUBST ( [ EXPANDED_BINDIR] )
1445
+ AC_SUBST ( [ EXPANDED_SBINDIR] )
1446
+ AC_SUBST ( [ EXPANDED_MANDIR] )
1447
+ AC_SUBST ( [ EXPANDED_LIBDIR] )
1448
+ AC_SUBST ( [ EXPANDED_DATADIR] )
1449
+ AC_SUBST ( [ EXPANDED_SYSCONFDIR] )
1450
+ AC_SUBST ( [ EXPANDED_LOCALSTATEDIR] )
1451
+ AC_SUBST ( [ EXPANDED_PHP_CONFIG_FILE_PATH] )
1452
+ AC_SUBST ( [ EXPANDED_PHP_CONFIG_FILE_SCAN_DIR] )
1453
1453
AC_SUBST ( [ PHP_INSTALLED_SAPIS] )
1454
1454
AC_SUBST ( [ SAPI_LIBNAME_SHARED] )
1455
1455
AC_SUBST ( [ SAPI_LIBNAME_STATIC] )
@@ -1620,7 +1620,7 @@ PHP_CONFIGURE_PART(Configuring libtool)
1620
1620
1621
1621
dnl Silence warning: `ar: 'u' modifier ignored since 'D' is the default`
1622
1622
dnl See https://github.com/php/php-src/pull/3017
1623
- AC_SUBST ( AR_FLAGS , [ cr] )
1623
+ AC_SUBST ( [ AR_FLAGS] , [ cr] )
1624
1624
1625
1625
dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by
1626
1626
dnl PHP_REQUIRE_CXX). Otherwise AC_PROG_LIBTOOL fails if there is no working C++
0 commit comments