File php7-freetype-pkgconfig.patch of Package php7.12839

Overview Repositories Revisions Requests Users Attributes Meta

File php7-freetype-pkgconfig.patch of Package php7.12839

Index: php-7.2.5/ext/gd/config.m4
===================================================================
--- php-7.2.5.orig/ext/gd/config.m4
+++ php-7.2.5/ext/gd/config.m4
@@ -184,30 +184,17 @@ AC_DEFUN([PHP_GD_XPM],[
 ])
 
 AC_DEFUN([PHP_GD_FREETYPE2],[
-  if test "$PHP_FREETYPE_DIR" != "no"; then
+    FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
+    FREETYPE2_LIBS=`pkg-config --libs freetype2`
 
-    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.])
+    if test -z "$FREETYPE2_LIBS"; then
+      AC_MSG_ERROR([freetype2 is not available.])
     fi
 
-    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
-    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
-
     PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
     PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
     AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
     AC_DEFINE(ENABLE_GD_TTF,1,[ ])
-  else
-    AC_MSG_RESULT([If configure fails try --with-freetype-dir=<DIR>])
-  fi
 ])
 
 AC_DEFUN([PHP_GD_JISX0208],[

Places

File php7-freetype-pkgconfig.patch of Package php7.12839

Places