b4a942
--- freetype-2.9/builds/unix/freetype-config.in
b4a942
+++ freetype-2.9/builds/unix/freetype-config.in
b4a942
@@ -13,45 +13,25 @@ LC_ALL=C
b4a942
 export LC_ALL
b4a942
 
b4a942
 
b4a942
-# if `pkg-config' is available, use values from `freetype2.pc'
b4a942
-%PKG_CONFIG% --atleast-pkgconfig-version 0.24 >/dev/null 2>&1
b4a942
-if test $? -eq 0 ; then
b4a942
-  # note that option `--variable' is not affected by the
b4a942
-  # PKG_CONFIG_SYSROOT_DIR environment variable
b4a942
-  if test "x$SYSROOT" != "x" ; then
b4a942
-    PKG_CONFIG_SYSROOT_DIR="$SYSROOT"
b4a942
-    export PKG_CONFIG_SYSROOT_DIR
b4a942
-  fi
b4a942
-
b4a942
-  prefix=`%PKG_CONFIG% --variable prefix freetype2`
b4a942
-  exec_prefix=`%PKG_CONFIG% --variable exec_prefix freetype2`
b4a942
-
b4a942
-  includedir=`%PKG_CONFIG% --variable includedir freetype2`
b4a942
-  libdir=`%PKG_CONFIG% --variable libdir freetype2`
b4a942
-
b4a942
-  version=`%PKG_CONFIG% --modversion freetype2`
b4a942
-
b4a942
-  cflags=`%PKG_CONFIG% --cflags freetype2`
b4a942
-  dynamic_libs=`%PKG_CONFIG% --libs freetype2`
b4a942
-  static_libs=`%PKG_CONFIG% --static --libs freetype2`
b4a942
-else
b4a942
-  prefix="%prefix%"
b4a942
-  exec_prefix="%exec_prefix%"
b4a942
-
b4a942
-  includedir="%includedir%"
b4a942
-  libdir="%libdir%"
b4a942
-
b4a942
-  version=%ft_version%
b4a942
-
b4a942
-  cflags="-I${SYSROOT}$includedir/freetype2"
b4a942
-  dynamic_libs="-lfreetype"
b4a942
-  static_libs="%LIBSSTATIC_CONFIG%"
b4a942
-  if test "${SYSROOT}$libdir" != "/usr/lib"   &&
b4a942
-     test "${SYSROOT}$libdir" != "/usr/lib64" ; then
b4a942
-    libs_L="-L${SYSROOT}$libdir"
b4a942
-  fi
b4a942
+# note that option `--variable' is not affected by the
b4a942
+# PKG_CONFIG_SYSROOT_DIR environment variable
b4a942
+if test "x$SYSROOT" != "x" ; then
b4a942
+  PKG_CONFIG_SYSROOT_DIR="$SYSROOT"
b4a942
+  export PKG_CONFIG_SYSROOT_DIR
b4a942
 fi
b4a942
 
b4a942
+prefix=`pkgconf --variable prefix freetype2`
b4a942
+exec_prefix=`pkgconf --variable exec_prefix freetype2`
b4a942
+
b4a942
+includedir=`pkgconf --variable includedir freetype2`
b4a942
+libdir=`pkgconf --variable libdir freetype2`
b4a942
+
b4a942
+version=`pkgconf --modversion freetype2`
b4a942
+
b4a942
+cflags=`pkgconf --cflags freetype2`
b4a942
+dynamic_libs=`pkgconf --libs freetype2`
b4a942
+static_libs=`pkgconf --static --libs freetype2`
b4a942
+
b4a942
 orig_prefix=$prefix
b4a942
 orig_exec_prefix=$exec_prefix
b4a942