diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-11-14 14:44:09 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-11-14 14:44:09 +0100 |
| commit | 2ba0bcee8b4b3c0ace3d70bae07d8d5d3152da95 (patch) | |
| tree | 7d1455411335efeb17779b72ab05fe86605888af | |
| parent | cf46de6e9faa6628650217f53bae72059475c63e (diff) | |
| download | dabmod-2ba0bcee8b4b3c0ace3d70bae07d8d5d3152da95.tar.gz dabmod-2ba0bcee8b4b3c0ace3d70bae07d8d5d3152da95.tar.bz2 dabmod-2ba0bcee8b4b3c0ace3d70bae07d8d5d3152da95.zip | |
Remove Makefile.am UHD check
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 8 | ||||
| -rw-r--r-- | src/OutputUHD.cpp | 4 | ||||
| -rw-r--r-- | src/OutputUHD.h | 3 |
4 files changed, 8 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 7f7ad0a..005b1fc 100644 --- a/configure.ac +++ b/configure.ac @@ -129,8 +129,6 @@ AS_IF([test "x$enable_output_uhd" = "xyes"], [AC_DEFINE(HAVE_OUTPUT_UHD, [1], [Define if UHD output is enabled]) , AC_CHECK_LIB([uhd], [main], [], [AC_MSG_ERROR([library uhd is missing])])]) -AM_CONDITIONAL([HAVE_OUTPUT_UHD_TEST], [test "x$enable_output_uhd" = "xyes"]) - AX_BOOST_BASE([1.41.0], [], AC_MSG_ERROR([BOOST 1.41 or later is required])) AC_CHECK_LIB([boost_system], [main], [], [AC_MSG_ERROR([library boost_system is missing])]) AC_CHECK_LIB([boost_thread], [main], [], [AC_MSG_ERROR([library boost_thread is missing])]) diff --git a/src/Makefile.am b/src/Makefile.am index 635a3d8..922ce52 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,12 +22,6 @@ else GITVERSION_FLAGS = endif -if HAVE_OUTPUT_UHD_TEST -UHD_SOURCES = OutputUHD.cpp OutputUHD.h -else -UHD_SOURCES = -endif - if HAVE_SSE SIMD_CFLAGS = -msse -msse2 else @@ -92,7 +86,7 @@ odr_dabmod_SOURCES = DabMod.cpp \ OutputMemory.cpp OutputMemory.h \ OutputZeroMQ.cpp OutputZeroMQ.h \ TimestampDecoder.h TimestampDecoder.cpp \ - $(UHD_SOURCES) \ + OutputUHD.cpp OutputUHD.h \ ModOutput.cpp ModOutput.h \ InputMemory.cpp InputMemory.h \ InputFileReader.cpp InputZeroMQReader.cpp InputReader.h \ diff --git a/src/OutputUHD.cpp b/src/OutputUHD.cpp index 3d8eea6..8063e75 100644 --- a/src/OutputUHD.cpp +++ b/src/OutputUHD.cpp @@ -25,6 +25,9 @@ */ #include "OutputUHD.h" + +#ifdef HAVE_OUTPUT_UHD + #include "PcDebug.h" #include "Log.h" #include "RemoteControl.h" @@ -652,3 +655,4 @@ const string OutputUHD::get_parameter(const string& parameter) const return ss.str(); } +#endif // HAVE_OUTPUT_UHD diff --git a/src/OutputUHD.h b/src/OutputUHD.h index ef9740d..a2ffb7d 100644 --- a/src/OutputUHD.h +++ b/src/OutputUHD.h @@ -42,6 +42,8 @@ DESCRIPTION: # include <config.h> #endif +#ifdef HAVE_OUTPUT_UHD + #include <uhd/utils/thread_priority.hpp> #include <uhd/utils/safe_main.hpp> #include <uhd/usrp/multi_usrp.hpp> @@ -230,6 +232,7 @@ class OutputUHD: public ModOutput, public RemoteControllable { size_t lastLen; }; +#endif // HAVE_OUTPUT_UHD #endif // OUTPUT_UHD_H |