From b410bee3a45052cdf118a00939fd161279c415a8 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Sun, 10 Jun 2007 19:02:38 +0000
Subject: - for build now 'pkg-config' needed - Use swscale to converting image

---
 liboutput/Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'liboutput/Makefile')

diff --git a/liboutput/Makefile b/liboutput/Makefile
index 126cfc8..7300393 100644
--- a/liboutput/Makefile
+++ b/liboutput/Makefile
@@ -9,6 +9,7 @@ VDRDIR = ../../../..
 
 CXX      ?= g++
 CXXFLAGS ?= -O0 -g -Wall -Woverloaded-virtual
+PKG-CONFIG ?= pkg-config
 
 -include $(VDRDIR)/Make.config
 
@@ -18,12 +19,16 @@ CXXFLAGS ?= -O0 -g -Wall -Woverloaded-virtual
 INCLUDES += -I$(VDRDIR)/include -I.
 ifdef FFMDIR
 INCLUDES += -I$(FFMDIR)/libavcodec -I$(FFMDIR)/libavutil
+DEFINES += -DFFMDIR
+else
+  INCLUDES += $(shell $(PKG-CONFIG) --cflags libavcodec)
 endif
 
 DEFINES  += -D_GNU_SOURCE
 
-ifdef FFMDIR
-DEFINES += -DFFMDIR
+ifndef WITHOUT_SWSCALER
+  DEFINES += -DHAVE_SWSCALER
+  INCLUDES += $(shell $(PKG-CONFIG) --cflags libswscale)
 endif
 
 ### The object files (add further files here):
-- 
cgit v1.2.3