fix bug #74343 compile fails on solaris 11 with system libgd

diff --git a/NEWS b/NEWS
index 0a5d441162697097a19fb95819124c916b0c31be..32646abc052797042642f386af04c7e946a1bd07 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2017 PHP 7.0.19
 
-
+- GD:
+  . Fixed bug #74343 (compile fails on solaris 11 with system gd2 library).
+    (krakjoe)
 
 13 Apr 2017 PHP 7.0.18
 

diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 1864d258be9be14f4dcf999aebcef8ffa3e28946..1bc5f98ccf4bf41c72c3f39c3dfc8f6edc652f48 100644 (file)
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -325,7 +325,7 @@ dnl Various checks for GD features
   PHP_GD_FREETYPE2
 
 dnl Header path
-  for i in include/gd include gd ""; do
+  for i in include/gd include/gd2 include gd ""; do
     test -f "$PHP_GD/$i/gd.h" && GD_INCLUDE="$PHP_GD/$i"
   done