mirror of
https://abf.rosa.ru/djam/php7.git
synced 2025-02-22 22:32:48 +00:00
27 lines
948 B
Diff
27 lines
948 B
Diff
diff -up php-7.2.5/ext/gd/config.m4.omv~ php-7.2.5/ext/gd/config.m4
|
|
--- php-7.2.5/ext/gd/config.m4.omv~ 2018-05-09 00:44:24.799260377 +0200
|
|
+++ php-7.2.5/ext/gd/config.m4 2018-05-09 00:45:22.108945925 +0200
|
|
@@ -185,21 +185,8 @@ AC_DEFUN([PHP_GD_XPM],[
|
|
|
|
AC_DEFUN([PHP_GD_FREETYPE2],[
|
|
if test "$PHP_FREETYPE_DIR" != "no"; then
|
|
-
|
|
- for i in $PHP_FREETYPE_DIR /usr/local /usr; do
|
|
- if test -f "$i/bin/freetype-config"; then
|
|
- FREETYPE2_DIR=$i
|
|
- FREETYPE2_CONFIG="$i/bin/freetype-config"
|
|
- break
|
|
- fi
|
|
- done
|
|
-
|
|
- if test -z "$FREETYPE2_DIR"; then
|
|
- AC_MSG_ERROR([freetype-config not found.])
|
|
- fi
|
|
-
|
|
- FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
|
|
- FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
|
|
+ FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
|
|
+ FREETYPE2_LIBS=`pkg-config --libs freetype2`
|
|
|
|
PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
|
|
PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
|