From 045587f6eca8b9e67814dfa97f14f1c07e86b3f9 Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Wed, 16 Nov 2016 20:30:14 +0100
Subject: [PATCH] make sure the private dvb headers are used on coolstream

---
 configure.ac                       | 4 ++--
 lib/sectionsdclient/Makefile.am    | 1 +
 lib/timerdclient/Makefile.am       | 1 +
 src/nhttpd/Makefile.am             | 3 ++-
 src/nhttpd/yhttpd_mods/Makefile.am | 1 +
 src/timerd/Makefile.am             | 1 +
 src/zapit/lib/Makefile.am          | 1 +
 7 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1f553e6e0..7fd8adc65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,7 +220,7 @@ if test "$BOXTYPE" = "coolstream"; then
 if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then
 	AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H,1,[Define to 1 if you have the <nevis_ir.h> header file.])
 fi
-HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream'
+HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream -I$(top_srcdir)/src/zapit/include/private'
 
 if test "$BOXMODEL" = "apollo"; then
 if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then
@@ -229,7 +229,7 @@ fi
 if test -e ${srcdir}/lib/libcoolstream2/cs_frontpanel.h; then
 	AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H,1,[Define to 1 if you have the <cs_frontpanel.h> header file.])
 fi
-HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2'
+HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2 -I$(top_srcdir)/src/zapit/include/private'
 fi
 fi
 
diff --git a/lib/sectionsdclient/Makefile.am b/lib/sectionsdclient/Makefile.am
index 016fb6603..8a322cd07 100644
--- a/lib/sectionsdclient/Makefile.am
+++ b/lib/sectionsdclient/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS = \
+	@HWLIB_CFLAGS@ \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
 	-I$(top_srcdir)/lib/connection \
diff --git a/lib/timerdclient/Makefile.am b/lib/timerdclient/Makefile.am
index ce2f0f72d..96b51f53b 100644
--- a/lib/timerdclient/Makefile.am
+++ b/lib/timerdclient/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS = \
+	@HWLIB_CFLAGS@ \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
 	-I$(top_srcdir)/lib/connection \
diff --git a/src/nhttpd/Makefile.am b/src/nhttpd/Makefile.am
index d1aae8bc4..1ea01bff6 100644
--- a/src/nhttpd/Makefile.am
+++ b/src/nhttpd/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = yhttpd_core yhttpd_mods tuxboxapi web
 AM_CPPFLAGS = -fno-rtti -fno-exceptions -D_FILE_OFFSET_BITS=64
 
 AM_CPPFLAGS += \
+	@HWLIB_CFLAGS@ \
 	-I$(srcdir) \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
@@ -23,4 +24,4 @@ libnhttpd_a_SOURCES = yhttpd.cpp
 
 libnhttpd_adir = @CONFIGDIR@
 libnhttpd_a_DATA = nhttpd.conf
-EXTRA_DIST = nhttpd.conf nhttpd.conf.in
\ No newline at end of file
+EXTRA_DIST = nhttpd.conf nhttpd.conf.in
diff --git a/src/nhttpd/yhttpd_mods/Makefile.am b/src/nhttpd/yhttpd_mods/Makefile.am
index 2e748d983..a08445dbd 100644
--- a/src/nhttpd/yhttpd_mods/Makefile.am
+++ b/src/nhttpd/yhttpd_mods/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS = \
+	@HWLIB_CFLAGS@ \
 	-I$(top_builddir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
diff --git a/src/timerd/Makefile.am b/src/timerd/Makefile.am
index 4bbe89fa6..b3c68456f 100644
--- a/src/timerd/Makefile.am
+++ b/src/timerd/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
 
 AM_CPPFLAGS += \
+	@HWLIB_CFLAGS@ \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
diff --git a/src/zapit/lib/Makefile.am b/src/zapit/lib/Makefile.am
index 2d884b259..e62c50637 100644
--- a/src/zapit/lib/Makefile.am
+++ b/src/zapit/lib/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 
 AM_CPPFLAGS += \
+	@HWLIB_CFLAGS@ \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src/zapit/include \