diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-01-14 14:13:23 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-01-14 14:13:42 +0100 |
| commit | 6674f81027942cee6acfb2bf2bff84b0d29e091d (patch) | |
| tree | 7dcdd69c9a4199b04c4b511e218d0f3d43a9d75e | |
| parent | e77a1dbe409aa9f2a2910f1337c8b90786597f69 (diff) | |
| parent | 60aff0bd30197a4fd898904a45f1677e333a6dda (diff) | |
| download | php-git-6674f81027942cee6acfb2bf2bff84b0d29e091d.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/gmp/config.m4 | 3 |
2 files changed, 7 insertions, 0 deletions
@@ -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) diff --git a/ext/gmp/config.m4 b/ext/gmp/config.m4 index 8265fb8dfa..22cca7eaf2 100644 --- a/ext/gmp/config.m4 +++ b/ext/gmp/config.m4 @@ -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 |