Skip to content

Commit 0988f69

Browse files
aragon999cmb69
authored andcommitted
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.
1 parent f494a36 commit 0988f69

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ PHP NEWS
44

55
- Core:
66
. Fixed bug #78768 (redefinition of typedef zend_property_info). (Nikita)
7+
. Fixed bug #78788 (./configure generates invalid php_version.h). (max)
78

89
- Standard:
910
. Fixed bug #77930 (stream_copy_to_stream should use mmap more often).

configure.ac

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ extern "C++" {
109109
])
110110

111111
ac_IFS=$IFS; IFS="."
112-
set $(echo AC_PACKAGE_VERSION | $SED 's/\([[0-9\.]]*\)\(.*\)/\1\.\2/')
112+
set $(echo AC_PACKAGE_VERSION | "${SED}" 's/\([[0-9\.]]*\)\(.*\)/\1\.\2/')
113113
IFS=$ac_IFS
114114
PHP_MAJOR_VERSION=[$]1
115115
PHP_MINOR_VERSION=[$]2
@@ -806,8 +806,8 @@ if test "$PHP_GCOV" = "yes"; then
806806

807807
dnl Remove all optimization flags from CFLAGS.
808808
changequote({,})
809-
CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'`
810-
CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'`
809+
CFLAGS=`echo "$CFLAGS" | "${SED}" -e 's/-O[0-9s]*//g'`
810+
CXXFLAGS=`echo "$CXXFLAGS" | "${SED}" -e 's/-O[0-9s]*//g'`
811811
changequote([,])
812812

813813
dnl Add the special gcc flags.
@@ -826,8 +826,8 @@ if test "$PHP_DEBUG" = "yes"; then
826826
PHP_DEBUG=1
827827
ZEND_DEBUG=yes
828828
changequote({,})
829-
CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'`
830-
CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'`
829+
CFLAGS=`echo "$CFLAGS" | "${SED}" -e 's/-O[0-9s]*//g'`
830+
CXXFLAGS=`echo "$CXXFLAGS" | "${SED}" -e 's/-O[0-9s]*//g'`
831831
changequote([,])
832832
dnl Add -O0 only if GCC or ICC is used.
833833
if test "$GCC" = "yes" || test "$ICC" = "yes"; then
@@ -1210,7 +1210,7 @@ libdir=`eval echo $libdir`
12101210
datadir=`eval eval echo $datadir`
12111211

12121212
dnl Build extension directory path.
1213-
ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|$SED 's/#define ZEND_MODULE_API_NO //'`
1213+
ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|"${SED}" 's/#define ZEND_MODULE_API_NO //'`
12141214

12151215
if test -z "$EXTENSION_DIR"; then
12161216
extbasedir=$ZEND_MODULE_API_NO

0 commit comments

Comments
 (0)