Merge branch 'PHP-7.0' into PHP-7.1

This commit is contained in:
Nikita Popov 2017-01-14 14:13:23 +01:00
commit 6674f81027
2 changed files with 7 additions and 0 deletions

4
NEWS
View file

@ -12,6 +12,10 @@ PHP NEWS
. Fixed bug #73904 (php-cgi fails to load -c specified php.ini file). (Anatol)
. Fixed bug #72898 (PHP_FCGI_CHILDREN is not included in phpinfo()). (Anatol)
- GMP:
. Fixed bug #69993 (test for gmp.h needs to test machine includes).
(Jordan Gigov)
- Hash:
. Added hash_hkdf() function. (Andrey Andreev)

View file

@ -3,8 +3,11 @@ PHP_ARG_WITH(gmp, for GNU MP support,
if test "$PHP_GMP" != "no"; then
MACHINE_INCLUDES=$($CC -dumpmachine)
for i in $PHP_GMP /usr/local /usr; do
test -f $i/include/gmp.h && GMP_DIR=$i && break
test -f $i/include/$MACHINE_INCLUDES/gmp.h && GMP_DIR=$i && break
done
if test -z "$GMP_DIR"; then