diff options
| author | max <max@swk-web.com> | 2019-11-07 07:45:55 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-11-07 10:01:02 +0100 |
| commit | 0988f6963420ab26b7804e080380b813ca79cfa8 (patch) | |
| tree | 39d77a3482457b549c22a21928a12c3285f36a26 | |
| parent | f494a366183cc5ee8f66f27522ae8d7c30157bb1 (diff) | |
| download | php-git-0988f6963420ab26b7804e080380b813ca79cfa8.tar.gz | |
Fix #78788: ./configure generates invalid php_version.h
Change $SED to "${SED}" such that the IFS is not used to split the
output of that variable.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 7 insertions, 6 deletions
@@ -4,6 +4,7 @@ PHP NEWS - Core: . Fixed bug #78768 (redefinition of typedef zend_property_info). (Nikita) + . Fixed bug #78788 (./configure generates invalid php_version.h). (max) - Standard: . Fixed bug #77930 (stream_copy_to_stream should use mmap more often). diff --git a/configure.ac b/configure.ac index 038a3fbb9f..40bb1a57ec 100644 --- a/configure.ac +++ b/configure.ac @@ -109,7 +109,7 @@ extern "C++" { ]) ac_IFS=$IFS; IFS="." -set $(echo AC_PACKAGE_VERSION | $SED 's/\([[0-9\.]]*\)\(.*\)/\1\.\2/') +set $(echo AC_PACKAGE_VERSION | "${SED}" 's/\([[0-9\.]]*\)\(.*\)/\1\.\2/') IFS=$ac_IFS PHP_MAJOR_VERSION=[$]1 PHP_MINOR_VERSION=[$]2 @@ -806,8 +806,8 @@ if test "$PHP_GCOV" = "yes"; then dnl Remove all optimization flags from CFLAGS. changequote({,}) - CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'` - CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'` + CFLAGS=`echo "$CFLAGS" | "${SED}" -e 's/-O[0-9s]*//g'` + CXXFLAGS=`echo "$CXXFLAGS" | "${SED}" -e 's/-O[0-9s]*//g'` changequote([,]) dnl Add the special gcc flags. @@ -826,8 +826,8 @@ if test "$PHP_DEBUG" = "yes"; then PHP_DEBUG=1 ZEND_DEBUG=yes changequote({,}) - CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'` - CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'` + CFLAGS=`echo "$CFLAGS" | "${SED}" -e 's/-O[0-9s]*//g'` + CXXFLAGS=`echo "$CXXFLAGS" | "${SED}" -e 's/-O[0-9s]*//g'` changequote([,]) dnl Add -O0 only if GCC or ICC is used. if test "$GCC" = "yes" || test "$ICC" = "yes"; then @@ -1210,7 +1210,7 @@ libdir=`eval echo $libdir` datadir=`eval eval echo $datadir` dnl Build extension directory path. -ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|$SED 's/#define ZEND_MODULE_API_NO //'` +ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|"${SED}" 's/#define ZEND_MODULE_API_NO //'` if test -z "$EXTENSION_DIR"; then extbasedir=$ZEND_MODULE_API_NO |