From ef3140e54414e03cb00a748ca50ca558e55f1729 Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Thu, 30 Mar 2017 16:27:40 +0100
Subject: [PATCH] fix bug #74343 compile fails on solaris 11 with system libgd

---
 NEWS             | 4 +++-
 ext/gd/config.m4 | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 0a5d441162..32646abc05 100644
--- 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 1864d258be..1bc5f98ccf 100644
--- 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
 
-- 
2.40.0