Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 655052 | Differences between
and this patch

Collapse All | Expand All

(-)a/m4/kpse-freetype2-flags.m4 (-6 / +9 lines)
Lines 27-37 Link Here
27
# ---------------------------
27
# ---------------------------
28
AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl
28
AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl
29
AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
29
AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
30
AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
30
PKG_CHECK_MODULES([FREETYPE2], [freetype2],[FREETYPE2_INCLUDES=$FREETYPE2_CFLAGS],[])
31
if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
31
if test -z FREETYPE2_INCLUDES; then
32
  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
32
  AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
33
  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
33
  if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
34
elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
34
    FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
35
  AC_MSG_ERROR([did not find freetype-config required for system freetype2 library])
35
    FREETYPE2_LIBS=`$FT2_CONFIG --libs`
36
  elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
37
    AC_MSG_ERROR([did not find freetype-config required for system freetype2 library])
38
  fi
36
fi
39
fi
37
]) # KPSE_FREETYPE2_SYSTEM_FLAGS
40
]) # KPSE_FREETYPE2_SYSTEM_FLAGS

Return to bug 655052