summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--ext/gmp/config.m43
2 files changed, 7 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index a9d0bdb716..7ee9299008 100644
--- a/NEWS
+++ b/NEWS
@@ -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