diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-11-07 10:01:43 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-11-07 10:01:43 +0100 |
| commit | 34dda406bd536b2739a16f29e90aa0ae67d05bbb (patch) | |
| tree | 505f44da1b0a883a53460afc26f11fcaa8f70eb4 | |
| parent | b312598daf8da5d7bc3224fc9a371b3ee3b78276 (diff) | |
| parent | 0988f6963420ab26b7804e080380b813ca79cfa8 (diff) | |
| download | php-git-34dda406bd536b2739a16f29e90aa0ae67d05bbb.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78788: ./configure generates invalid php_version.h
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 1370ffae0a..19927da679 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 @@ -807,8 +807,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. @@ -827,8 +827,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 @@ -1225,7 +1225,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 |