com php-src: fix bug #74343 compile fails on solaris 11 with system libgd: NEWS ext/gd/config.m4

[email protected] (Joe Watkins)
Newsgroups php.cvs
Message-ID <[email protected]>
Commit:    ef3140e54414e03cb00a748ca50ca558e55f1729
Author:    Joe Watkins <[email protected]>         Thu, 30 Mar 2017 16:27:40 +0100
Parents:   d6f70f0ee3d5f595a9f6dadaabda834a1d47c662
Branches:  PHP-7.0 PHP-7.1 master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=ef3140e54414e03cb00a748ca50ca558e55f1729

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

Bugs:
https://bugs.php.net/74343

Changed paths:
  M  NEWS
  M  ext/gd/config.m4


Diff:
diff --git a/NEWS b/NEWS
index 0a5d441..32646ab 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 1864d25..1bc5f98 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
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.