3 files changed, 11 insertions, 11 deletions
diff --git a/HISTORY b/HISTORY
index 2dc98d4..bb4e3b3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -74,6 +74,7 @@ ____-__-__: Version 1.3
 - Updated gettext language files
 - Removed backward compatibility to VDR < 1.6.0 (closes #137)
 - Fixed compile error if ImageMagick has double as Quantum type (closes #140)
+- Use pkg-config to find compilation flags, libs etc for FreeType and Imlib2.
 
 2009-06-01: Version 1.2
 
diff --git a/Makefile b/Makefile
index 382595f..947e71c 100644
--- a/Makefile
+++ b/Makefile
@@ -75,25 +75,20 @@ endif
 
 ifdef HAVE_IMLIB2
 	DEFINES += -DHAVE_IMLIB2
-	LIBS += -lImlib2
+	INCLUDES += $(shell pkg-config --cflags imlib2)
+	LIBS += $(shell pkg-config --libs imlib2)
 endif
 
 ifdef HAVE_IMAGEMAGICK
 	DEFINES += -DHAVE_IMAGEMAGICK
-	INCLUDES += `pkg-config --cflags ImageMagick++`
-	LIBS += `pkg-config --libs ImageMagick++`
-#	LIBS += $(shell Magick++-config --ldflags --libs)
+	INCLUDES += $(shell pkg-config --cflags ImageMagick++)
+	LIBS += $(shell pkg-config --libs ImageMagick++)
 endif
 
 ifdef HAVE_FREETYPE
-	ifneq ($(shell which freetype-config),)
-		INCLUDES += $(shell freetype-config --cflags)
-		LIBS += $(shell freetype-config --libs)
-	else
-		INCLUDES += -I/usr/include/freetype -I/usr/local/include/freetype
-		LIBS += -lfreetype
-	endif
 	DEFINES += -DHAVE_FREETYPE
+	INCLUDES += $(shell pkg-config --cflags freetype2)
+	LIBS += $(shell pkg-config --libs freetype2)
 	OBJS += graphtft/font.o
 endif
 
diff --git a/README b/README
index f29378e..25cb133 100644
--- a/README
+++ b/README
@@ -50,6 +50,10 @@ Some skins may use True Type Fonts, which requires the FreeType package to be
 installed. If you don't want to use FreeType font rendering, you may disable
 that in the Makefile, too.
 
+The Makefile uses pkg-config by default to find out the necessary compiler,
+preprocessor and linker flags and libraries for the above, so you'll need it
+and the *.pc files for the above packages properly installed as well.
+
 
 Installation:
 -------------