From: Yordan Gigov <jgigov@abv.bg>
Date: Fri, 12 Aug 2016 14:52:18 +0000 (+0300)
Subject: Fixed bug #69993
X-Git-Tag: php-7.1.2RC1~72^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60aff0bd30197a4fd898904a45f1677e333a6dda;p=php

Fixed bug #69993
---

diff --git a/NEWS b/NEWS
index 27788427d4..ce4a7482d4 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,10 @@ PHP                                                                        NEWS
   . Fixed bug #67583 (double fastcgi_end_request on max_children limit).
     (Dmitry Saprykin)
 
+- GMP:
+  . Fixed bug #69993 (test for gmp.h needs to test machine includes).
+    (Jordan Gigov) 
+
 - Mysqlnd:
   . Fixed bug #69899 (segfault on close() after free_result() with mysqlnd).
     (Richard Fussenegger)
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