diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-10-07 04:52:50 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-10-07 04:52:50 +0200 |
| commit | 0aa6201a490bfabc0ae021ceb9f1fb0f46727c5d (patch) | |
| tree | a71d934d8151dd43e7c16555fef17fd749c5da70 /configure.ac | |
| parent | 558d74bffd9f069955af52c0b308a1d6169bcff0 (diff) | |
| parent | 0330221d51421caa110b8c5dcb567cc3d0620eb9 (diff) | |
| download | dabmod-0aa6201a490bfabc0ae021ceb9f1fb0f46727c5d.tar.gz dabmod-0aa6201a490bfabc0ae021ceb9f1fb0f46727c5d.tar.bz2 dabmod-0aa6201a490bfabc0ae021ceb9f1fb0f46727c5d.zip | |
Merge lime output into next branch
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index c85da3e..d21ec29 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ # along with ODR-DabMod. If not, see <http://www.gnu.org/licenses/>. AC_PREREQ(2.69) -AC_INIT([ODR-DabMod], [2.3.0], [matthias.braendli@mpb.li]) +AC_INIT([ODR-DabMod], [2.3.1], [matthias.braendli@mpb.li]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_SYSTEM @@ -49,9 +49,6 @@ AC_ARG_ENABLE([trace], AC_ARG_ENABLE([zeromq], [AS_HELP_STRING([--disable-zeromq], [Disable ZeroMQ input, output and remote control])], [], [enable_zeromq=yes]) -AC_ARG_ENABLE([edi], - [AS_HELP_STRING([--enable-edi], [Enable EDI input])], - [], [enable_edi=no]) AC_ARG_ENABLE([native], [AS_HELP_STRING([--disable-native], [Do not compile with -march=native])], [], [enable_native=yes]) @@ -131,16 +128,9 @@ AS_IF([test "x$enable_output_uhd" = "xyes"], AS_IF([test "x$enable_soapysdr" = "xyes"], [AC_DEFINE(HAVE_SOAPYSDR, [1], [Define if SoapySDR output is enabled])]) -AS_IF([test "x$enable_edi" = "xyes"], - [AC_DEFINE(HAVE_EDI, [1], [Define if EDI input is enabled]) ]) - AS_IF([test "x$enable_limesdr" = "xyes"], [AC_DEFINE(HAVE_LIMESDR, [1], [Define if LimeSDR input is enabled]) ]) - - -AM_CONDITIONAL([COMPILE_EDI], [test "x$enable_edi" = "xyes"]) - AS_IF([test "x$enable_easydabv3" = "xyes"], AC_DEFINE(BUILD_FOR_EASYDABV3, [1], [Define if we are building for EasyDABv3])) @@ -212,7 +202,7 @@ echo "***********************************************" echo enabled="" disabled="" -for feat in edi prof trace output_uhd zeromq soapysdr easydabv3 limesdr +for feat in prof trace output_uhd zeromq soapysdr easydabv3 limesdr do eval var=\$enable_$feat AS_IF([test "x$var" = "xyes"], |