* Fix include path for moved header files

configure.ac

@@ -118,7 +118,9 @@ AC_ARG_ENABLE(cleanup,
 	[  --enable-cleanup                  enable cleanup on exit],
 	[AC_DEFINE(EXIT_CLEANUP,1,[enable cleanup on exit])])
 
-AC_CHECK_HEADERS(coolstream/nevis_ir.h)
+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
 
 #
 # Check for libtdservicedb - the new one - for testing only

lib/libcoolstream/cs_api.h

@@ -9,7 +9,7 @@
 #ifndef __CS_API_H_
 #define __CS_API_H_
 
-#include <coolstream/control.h>
+#include <control.h>
 #include <sys/types.h>
 
 typedef void (*cs_messenger) (unsigned int msg, unsigned int data);

lib/libcoolstream/video_cs.h

@@ -9,8 +9,8 @@
 #ifndef __VIDEO_CS_H_
 #define __VIDEO_CS_H_
 
-#include <coolstream/cs_vfd.h>
-#include <coolstream/control.h>
+#include <cs_vfd.h>
+#include <control.h>
 
 #include "cs_types.h"
 

src/driver/rcinput.h

@@ -39,7 +39,7 @@
 #include <string>
 #include <vector>
 #ifdef HAVE_COOLSTREAM_NEVIS_IR_H
-#include <coolstream/nevis_ir.h>
+#include <nevis_ir.h>
 #endif
 
 #ifndef KEY_OK

src/driver/vfd.h

@@ -42,7 +42,7 @@
 
 #include <pthread.h>
 #include <string>
-#include <coolstream/cs_vfd.h>
+#include <cs_vfd.h>
 
 class CVFD
 {

src/drivertool.c

@@ -29,10 +29,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <coolstream/cs_vfd.h>
+#include <cs_vfd.h>
 
 #ifdef HAVE_COOLSTREAM_NEVIS_IR_H
-#include <coolstream/nevis_ir.h>
+#include <nevis_ir.h>
 #endif
 
 #ifndef IOC_IR_SET_PRI_PROTOCOL

src/neutrino.cpp

@@ -1696,7 +1696,7 @@ void CNeutrinoApp::InitSectiondClient()
 }
 
 #if HAVE_COOL_HARDWARE
-#include <coolstream/cs_vfd.h>
+#include <cs_vfd.h>
 #endif
 
 void wake_up( bool &wakeup)

src/system/setting_helpers.cpp

@@ -47,10 +47,6 @@
 #include <sys/wait.h>
 #include <sys/ioctl.h>
 
-#if HAVE_COOL_HARDWARE
-#include <coolstream/control.h>
-#endif
-
 #include <config.h>
 
 #include <global.h>