diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2016-12-22 13:20:16 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2016-12-22 13:20:16 +0100 |
| commit | 5c8d366975d195ba9f1be4a6fd65f2873ad8c301 (patch) | |
| tree | 51f8ece224477e2246d14bbb08c8e70000b5edcc | |
| parent | 26252c37cdff5f0fd5d5659823aaa59f2ab26bd9 (diff) | |
| download | vdr-5c8d366975d195ba9f1be4a6fd65f2873ad8c301.tar.gz vdr-5c8d366975d195ba9f1be4a6fd65f2873ad8c301.tar.bz2 | |
Fixed building VDR with systemd >= 230
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | Makefile | 6 |
3 files changed, 5 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 0e6574b5..35ea4f6f 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2063,6 +2063,7 @@ Ville Skyttä <ville.skytta@iki.fi> for reporting a possible NULL pointer dereference in cCiSession::SendData() for reporting a superfluous assignment in cPipe::Open() for avoiding unnecessary pkg-config warnings in plugin Makefiles + for fixing building VDR with systemd >= 230 Steffen Beyer <cpunk@reactor.de> for fixing setting the colored button help after deleting a recording in case the next @@ -8865,3 +8865,4 @@ Video Disk Recorder Revision History - Added cFont::Width(void) to get the default character width and allow stretched font drawing in high level OSDs (thanks to Thomas Reufer). - Fixed regenerating the index of audio recordings (thanks to Thomas Reufer). +- Fixed building VDR with systemd >= 230 (thanks to Ville Skyttä). @@ -4,7 +4,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: Makefile 3.6 2015/02/09 12:28:24 kls Exp $ +# $Id: Makefile 4.1 2016/12/22 13:18:32 kls Exp $ .DELETE_ON_ERROR: @@ -95,9 +95,9 @@ DEFINES += -DBIDI LIBS += $(shell pkg-config --libs fribidi) endif ifdef SDNOTIFY -INCLUDES += $(shell pkg-config --cflags libsystemd-daemon) +INCLUDES += $(shell pkg-config --silence-errors --cflags libsystemd-daemon || pkg-config --cflags libsystemd) DEFINES += -DSDNOTIFY -LIBS += $(shell pkg-config --libs libsystemd-daemon) +LIBS += $(shell pkg-config --silence-errors --libs libsystemd-daemon || pkg-config --libs libsystemd) endif LIRC_DEVICE ?= /var/run/lirc/lircd |