From 27315a43cc99c3318ec2f80e53135fdb5eed080f Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 5 Feb 2012 19:32:20 +0100 Subject: [PATCH] add USE_NEUTRINO_HAL define for libneutrino-hal --- configure.ac | 3 +++ src/zapit/include/dmx.h | 4 +++- src/zapit/include/video.h | 5 ++++- src/zapit/src/zapit.cpp | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 7249806ec..1c6f1d8df 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,9 @@ AC_ARG_WITH(neutrino-hal-build, [NEUTRINO_HAL_LIB="$withval"],[NEUTRINO_HAL_LIB=""]) AM_CONDITIONAL(USE_NEUTRINO_HAL, test "$NEUTRINO_HAL_INC") +if test "$NEUTRINO_HAL_INC"; then + AC_DEFINE(USE_NEUTRINO_HAL, 1,[use libneutrino-hal]) +fi AC_CHECK_HEADERS(coolstream/nevis_ir.h) diff --git a/src/zapit/include/dmx.h b/src/zapit/include/dmx.h index 8dd57df69..74959cb16 100644 --- a/src/zapit/include/dmx.h +++ b/src/zapit/include/dmx.h @@ -1,9 +1,11 @@ #if HAVE_COOL_HARDWARE #include +#elif USE_NEUTRINO_HAL +#include #elif HAVE_TRIPLEDRAGON #include #else -#error neither HAVE_COOL_HARDWARE nor HAVE_TRIPLEDRAGON defined. +#error neither HAVE_COOL_HARDWARE nor HAVE_TRIPLEDRAGON nor USE_NEUTRINO_HAL defined. #error do you need to include config.h? #endif diff --git a/src/zapit/include/video.h b/src/zapit/include/video.h index 636dc2189..baa930d4d 100644 --- a/src/zapit/include/video.h +++ b/src/zapit/include/video.h @@ -2,7 +2,10 @@ #include #include #endif -#if HAVE_TRIPLEDRAGON +#if USE_NEUTRINO_HAL +#include +#include +#elif HAVE_TRIPLEDRAGON #include #include #endif diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 077815293..ead272982 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -60,7 +60,7 @@ #include #include #endif -#if HAVE_TRIPLEDRAGON +#if USE_NEUTRINO_HAL || HAVE_TRIPLEDRAGON #include #include #endif