Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= <ondrej@sury.org> |
| 2 | Date: Mon, 22 Oct 2018 06:54:31 +0000 |
| 3 | Subject: Use pkg-config for FreeType2 detection |
| 4 | |
| 5 | --- |
| 6 | ext/gd/config.m4 | 30 +++++++++++++++++++----------- |
| 7 | 1 file changed, 19 insertions(+), 11 deletions(-) |
| 8 | |
| 9 | diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 |
| 10 | index 498d870..d28c6ae 100644 |
| 11 | --- a/ext/gd/config.m4 |
| 12 | +++ b/ext/gd/config.m4 |
| 13 | @@ -184,21 +184,29 @@ AC_DEFUN([PHP_GD_XPM],[ |
| 14 | AC_DEFUN([PHP_GD_FREETYPE2],[ |
| 15 | if test "$PHP_FREETYPE_DIR" != "no"; then |
| 16 | |
| 17 | - for i in $PHP_FREETYPE_DIR /usr/local /usr; do |
| 18 | - if test -f "$i/bin/freetype-config"; then |
| 19 | - FREETYPE2_DIR=$i |
| 20 | - FREETYPE2_CONFIG="$i/bin/freetype-config" |
| 21 | - break |
| 22 | + if test -z "$PKG_CONFIG"; then |
| 23 | + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) |
| 24 | + fi |
| 25 | + if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then |
| 26 | + FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2` |
| 27 | + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` |
| 28 | + else |
| 29 | + for i in $PHP_FREETYPE_DIR /usr/local /usr; do |
| 30 | + if test -f "$i/bin/freetype-config"; then |
| 31 | + FREETYPE2_DIR=$i |
| 32 | + FREETYPE2_CONFIG="$i/bin/freetype-config" |
| 33 | + break |
| 34 | + fi |
| 35 | + done |
| 36 | + |
| 37 | + if test -z "$FREETYPE2_DIR"; then |
| 38 | + AC_MSG_ERROR([freetype-config not found.]) |
| 39 | fi |
| 40 | - done |
| 41 | |
| 42 | - if test -z "$FREETYPE2_DIR"; then |
| 43 | - AC_MSG_ERROR([freetype-config not found.]) |
| 44 | + FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` |
| 45 | + FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` |
| 46 | fi |
| 47 | |
| 48 | - FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` |
| 49 | - FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` |
| 50 | - |
| 51 | PHP_EVAL_INCLINE($FREETYPE2_CFLAGS) |
| 52 | PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD) |
| 53 | AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) |