libotf/repos/extra-x86_64/replace-freetype-config.patch

   1 --- libotf-0.9.16/configure.ac
   2 +++ libotf-0.9.16/configure.ac
   3 @@ -48,23 +48,24 @@
   4  AC_FUNC_ALLOCA
   5  AC_FUNC_MALLOC
   6
   7 +PKG_PROG_PKG_CONFIG
   8 +
   9  # Check for Freetype2 usability.
  10 -AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
  11 -if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
  12 -  FREETYPE_INC=`freetype-config --cflags`
  13 +PKG_CHECK_MODULES(FREETYPE, freetype2, [
  14 +  FREETYPE_INC="$FREETYPE_CFLAGS"
  15    CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
  16    AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes,
  17                               HAVE_FREETYPE=no CPPFLAGS=$save_CPPFLAGS)
  18    if test "x$HAVE_FREETYPE" = "xyes" ; then
  19 -    FREETYPE_LD_FLAGS=`freetype-config --libs`;
  20 +    FREETYPE_LD_FLAGS="$FREETYPE_LIBS"
  21      LIBS="$LIBS $FREETYPE_LD_FLAGS"
  22      AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes,
  23                                              HAVE_FREETYPE=no)
  24    fi
  25 -fi
  26 +])
  27
  28  if test "x$HAVE_FREETYPE" != "xyes" ; then
  29 -  echo "Freetype library wan't found in your system!"
  30 +  echo "Freetype library not found in your system!"
  31    exit 1
  32  fi
  33  AC_SUBST(FREETYPE_INC)