Skip to content

Autotools: Quote PHP_SUBST arguments in configure.ac #14757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 2, 2024
Merged

Autotools: Quote PHP_SUBST arguments in configure.ac #14757

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 45 additions & 47 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTR
PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`

dnl Allow version values to be used in Makefile.
PHP_SUBST(PHP_MAJOR_VERSION)
PHP_SUBST(PHP_MINOR_VERSION)
PHP_SUBST(PHP_RELEASE_VERSION)
PHP_SUBST(PHP_EXTRA_VERSION)
PHP_SUBST([PHP_MAJOR_VERSION])
PHP_SUBST([PHP_MINOR_VERSION])
PHP_SUBST([PHP_RELEASE_VERSION])
PHP_SUBST([PHP_EXTRA_VERSION])

dnl Define where extension directories are located in the configure context.
AC_DEFUN([PHP_EXT_BUILDDIR],[$config_m4_dir])dnl
Expand Down Expand Up @@ -1482,40 +1482,38 @@ if test -n "${PHP_BUILD_ARCH}"; then
AC_DEFINE_UNQUOTED(PHP_BUILD_ARCH,"$PHP_BUILD_ARCH",[build architecture])
fi

PHP_SUBST(PHP_FASTCGI_OBJS)
PHP_SUBST(PHP_SAPI_OBJS)
PHP_SUBST(PHP_BINARY_OBJS)
PHP_SUBST(PHP_GLOBAL_OBJS)

PHP_SUBST(PHP_BINARIES)
PHP_SUBST(PHP_MODULES)
PHP_SUBST(PHP_ZEND_EX)
PHP_SUBST(bindir)
PHP_SUBST(sbindir)
PHP_SUBST(exec_prefix)
PHP_SUBST([PHP_FASTCGI_OBJS])
PHP_SUBST([PHP_SAPI_OBJS])
PHP_SUBST([PHP_BINARY_OBJS])
PHP_SUBST([PHP_GLOBAL_OBJS])
PHP_SUBST([PHP_BINARIES])
PHP_SUBST([PHP_MODULES])
PHP_SUBST([PHP_ZEND_EX])
PHP_SUBST([bindir])
PHP_SUBST([sbindir])
PHP_SUBST([exec_prefix])
PHP_SUBST_OLD([program_prefix])
PHP_SUBST_OLD([program_suffix])
PHP_SUBST(includedir)
PHP_SUBST([includedir])
PHP_SUBST_OLD([orig_libdir])
PHP_SUBST(libdir)
PHP_SUBST(mandir)
PHP_SUBST(phptempdir)
PHP_SUBST(prefix)
PHP_SUBST(localstatedir)
PHP_SUBST(datadir)
PHP_SUBST(datarootdir)
PHP_SUBST(sysconfdir)

PHP_SUBST(EXEEXT)
PHP_SUBST(CC)
PHP_SUBST(BUILD_CC)
PHP_SUBST(CFLAGS)
PHP_SUBST(CFLAGS_CLEAN)
PHP_SUBST(CPP)
PHP_SUBST(CPPFLAGS)
PHP_SUBST(CXX)
PHP_SUBST(CXXFLAGS)
PHP_SUBST(CXXFLAGS_CLEAN)
PHP_SUBST([libdir])
PHP_SUBST([mandir])
PHP_SUBST([phptempdir])
PHP_SUBST([prefix])
PHP_SUBST([localstatedir])
PHP_SUBST([datadir])
PHP_SUBST([datarootdir])
PHP_SUBST([sysconfdir])
PHP_SUBST([EXEEXT])
PHP_SUBST([CC])
PHP_SUBST([BUILD_CC])
PHP_SUBST([CFLAGS])
PHP_SUBST([CFLAGS_CLEAN])
PHP_SUBST([CPP])
PHP_SUBST([CPPFLAGS])
PHP_SUBST([CXX])
PHP_SUBST([CXXFLAGS])
PHP_SUBST([CXXFLAGS_CLEAN])
PHP_SUBST_OLD([EXTENSION_DIR])
PHP_SUBST([EXTRA_LDFLAGS])
PHP_SUBST([EXTRA_LDFLAGS_PROGRAM])
Expand All @@ -1524,16 +1522,16 @@ PHP_SUBST([ZEND_EXTRA_LIBS])
PHP_SUBST([INCLUDES])
PHP_SUBST([EXTRA_INCLUDES])
PHP_SUBST([INSTALL_IT])
PHP_SUBST(LIBTOOL)
PHP_SUBST(LN_S)
PHP_SUBST([LIBTOOL])
PHP_SUBST([LN_S])
PHP_SUBST([NATIVE_RPATHS])
PHP_SUBST(OVERALL_TARGET)
PHP_SUBST(PHP_RPATHS)
PHP_SUBST(PHP_SAPI)
PHP_SUBST(SHELL)
PHP_SUBST(PHP_FRAMEWORKS)
PHP_SUBST(PHP_FRAMEWORKPATH)
PHP_SUBST(INSTALL_HEADERS)
PHP_SUBST([OVERALL_TARGET])
PHP_SUBST([PHP_RPATHS])
PHP_SUBST([PHP_SAPI])
PHP_SUBST([SHELL])
PHP_SUBST([PHP_FRAMEWORKS])
PHP_SUBST([PHP_FRAMEWORKPATH])
PHP_SUBST([INSTALL_HEADERS])

old_CC=$CC

Expand Down Expand Up @@ -1653,9 +1651,9 @@ fi;
all_targets="\$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd"
install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install"

PHP_SUBST(all_targets)
PHP_SUBST(install_targets)
PHP_SUBST(install_binary_targets)
PHP_SUBST([all_targets])
PHP_SUBST([install_targets])
PHP_SUBST([install_binary_targets])

PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/])
PHP_INSTALL_HEADERS([Zend/Optimizer], [ \
Expand Down
Loading