Now using pkg-config to get fribidi cflags and libs

This commit is contained in:
Klaus Schmidinger 2011-04-17 13:26:57 +02:00
parent 5138ccc1ce
commit e33a38a542
3 changed files with 5 additions and 3 deletions

View File

@ -1892,6 +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
Steffen Beyer <cpunk@reactor.de>
for fixing setting the colored button help after deleting a recording in case the next

View File

@ -6600,3 +6600,4 @@ 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ä).

View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
# $Id: Makefile 2.14 2011/02/27 09:59:11 kls Exp $
# $Id: Makefile 2.15 2011/04/17 13:26:02 kls Exp $
.DELETE_ON_ERROR:
@ -54,9 +54,9 @@ ifdef VDR_USER
DEFINES += -DVDR_USER=\"$(VDR_USER)\"
endif
ifdef BIDI
INCLUDES += -I/usr/include/fribidi
INCLUDES += $(shell pkg-config --cflags fribidi)
DEFINES += -DBIDI
LIBS += -lfribidi
LIBS += $(shell pkg-config --libs fribidi)
endif
LIRC_DEVICE ?= /dev/lircd