From: Remi Collet <remi@php.net>
Date: Mon, 22 Jul 2019 07:11:32 +0000 (+0200)
Subject: improve temporary fix for system libgd
X-Git-Tag: php-7.4.0beta1~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fff6b18657c26d18a4154d974908101770c7b66d;p=php

improve temporary fix for system libgd

- PHP_GD_PNG needed to set include path for png.h
- PHP_GD_JPEG needed to set include path for jpeglib.h
---

diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 662a9c8c2e..8271eb27b1 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -177,7 +177,13 @@ dnl Various checks for GD features
     ], [ $GD_SHARED_LIBADD ], [char foobar () {}])
 
   else
+    dnl for png.h in gd_compat (PNG_LIBPNG_VER_STRING)
+    PHP_GD_PNG
+    dnl for jpeglib.h in gd_compat (JPEG_LIB_VERSION)
+    PHP_GD_JPEG
+    dnl for X11/xpm.h in gd.c (XpmLibraryVersion)
     PHP_GD_XPM
+    dnl for ft2build.h in gd.c (FREETYPE_MAJOR...)
     PHP_GD_FREETYPE2
 
     extra_sources="gd_compat.c"