From bcdd5cb8864ae01e42c32fe34f60083aa6184046 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 17 Apr 2011 13:29:42 +0200
Subject: [PATCH] Now using pkg-config to get fribidi, freetype and fontconfig
 cflags and libs

---
 CONTRIBUTORS | 2 +-
 HISTORY      | 3 ++-
 Makefile     | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d345409c..a9c74f5a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1892,7 +1892,7 @@ Ville Skytt
  for making 'dist' target dependent on up to date *.po
  for adding Language and fixing Language-Team header of *.po
  for fixing the Language header of the Serbian translation file
- for using pkg-config to get fribidi cflags and libs
+ for using pkg-config to get fribidi, freetype and fontconfig cflags and libs
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
diff --git a/HISTORY b/HISTORY
index 7b9b1512..195ae843 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6600,4 +6600,5 @@ Video Disk Recorder Revision History
   Andreas Regel).
 - Removed an obsolete local variable in dvbsdffosd.c (thanks to Paul Menzel).
 - Fixed a possible NULL pointer dereference in osddemo.c (reported by Paul Menzel).
-- Now using pkg-config to get fribidi cflags and libs (thanks to Ville Skyttä).
+- Now using pkg-config to get fribidi, freetype and fontconfig cflags and libs (thanks
+  to Ville Skyttä).
diff --git a/Makefile b/Makefile
index 30a72b8c..8e6b80cb 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.15 2011/04/17 13:26:02 kls Exp $
+# $Id: Makefile 2.16 2011/04/17 13:29:01 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -20,8 +20,8 @@ PREFIX  ?= /usr/local
 MANDIR   = $(PREFIX)/share/man
 BINDIR   = $(PREFIX)/bin
 LOCDIR   = ./locale
-LIBS     = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
-INCLUDES ?= $(shell pkg-config --cflags freetype2)
+LIBS     = -ljpeg -lpthread -ldl -lcap -lrt $(shell pkg-config --libs freetype2 fontconfig)
+INCLUDES ?= $(shell pkg-config --cflags freetype2 fontconfig)
 
 PLUGINDIR= ./PLUGINS
 PLUGINLIBDIR= $(PLUGINDIR)/lib