x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33

--- a/configure.ac
+++ b/configure.ac
@@ -1005,13 +1005,13 @@
 	AC_ARG_ENABLE(xft, [  --enable-xft            turn on Xft support [[default=yes]]])
 
 	xft_found=no
-	if test x$enable_xft != xno; then
-	    AC_PATH_PROG(FTCONFIG, freetype-config)
-
-	    if test "x$FTCONFIG" != x; then
-		CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS"
-		CFLAGS="`$FTCONFIG --cflags` $CFLAGS"
-		CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS"
+	AS_IF([test x$enable_xft != xno], [
+	    PKG_PROG_PKG_CONFIG
+	    PKG_CHECK_MODULES(FREETYPE, freetype2, [
+		CPPFLAGS="$FREETYPE_CFLAGS $CPPFLAGS"
+		CFLAGS="$FREETYPE_CFLAGS $CFLAGS"
+		CXXFLAGS="$FREETYPE_CFLAGS $CXXFLAGS"
+	    ],AC_MSG_ERROR([No freetype found]))
 
 		AC_CHECK_LIB(fontconfig, FcPatternCreate)
 		AC_CHECK_HEADER(X11/Xft/Xft.h,
@@ -1019,8 +1019,7 @@
 			[AC_DEFINE(USE_XFT)
 			 LIBS="-lXft $LIBS"
 			 xft_found=yes] ))
-	    fi
-	fi
+	])
 
 	dnl Issue a warning message if Xft was not found, abort configure
 	dnl if Xft was requested explicitly (but not found)