diff options
| author | Eli Schwartz <eschwartz93@gmail.com> | 2018-05-14 17:25:37 -0400 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-07 13:05:47 +0100 |
| commit | 2d03197749696ac3f8effba6b7977b0d8729fef3 (patch) | |
| tree | 2c7327c6007ce3f175bb81e9ae489e6abc189132 /scripts | |
| parent | f20029807560677077f3f94764caada869329e26 (diff) | |
| download | php-git-2d03197749696ac3f8effba6b7977b0d8729fef3.tar.gz | |
ext/gd: Use pkg-config to detect the availability of freetype2
The latest version of freetype2 does not install freetype-config by
default, but pkg-config support has been there for approximately 15
years. In order to reliably detect freetype2, pkg-config *must* be used.
See:
https://savannah.nongnu.org/bugs/?53093
https://bugs.php.net/bug.php?id=76324
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.frag | 1 | ||||
| -rw-r--r-- | scripts/phpize.in | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag index d7f8475014..b4f62bc74d 100644 --- a/scripts/Makefile.frag +++ b/scripts/Makefile.frag @@ -12,6 +12,7 @@ BUILD_FILES = \ build/ax_check_compile_flag.m4 \ build/ax_gcc_func_attribute.m4 \ build/php_cxx_compile_stdcxx.m4 \ + build/pkg.m4 \ Makefile.global \ acinclude.m4 \ ltmain.sh \ diff --git a/scripts/phpize.in b/scripts/phpize.in index 5cb62a3736..a9433e57b9 100644 --- a/scripts/phpize.in +++ b/scripts/phpize.in @@ -9,7 +9,7 @@ includedir="`eval echo @includedir@`/php" builddir="`pwd`" SED="@SED@" -FILES_BUILD="scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4" +FILES_BUILD="scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4 pkg.m4" FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php" CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ install-sh \ mkinstalldirs missing config.nice config.sub config.guess configure configure.ac \ |