summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac31
1 files changed, 2 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac
index b71fb2e..60b1e4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,15 +64,6 @@ AC_ARG_ENABLE([trace],
[AS_HELP_STRING([--enable-trace], [Enable trace output])],
[], [enable_trace=no])
-# Which FFT library to use
-AC_ARG_ENABLE([fft_simd],
- [AS_HELP_STRING([--enable-fft-simd],
- [Enable SIMD instructions for kiss-fft (unstable)])],
- [], [enable_fft_simd=no])
-AC_ARG_ENABLE([kiss_fft],
- [AS_HELP_STRING([--enable-kiss-fft], [Prefer KISS FFT over FFTW3])],
- [], [enable_kiss=no])
-
# ZeroMQ message queue input
AC_ARG_ENABLE([zeromq],
[AS_HELP_STRING([--disable-zeromq], [Disable ZeroMQ input, output and remote control])],
@@ -83,13 +74,7 @@ AC_ARG_ENABLE([output_uhd],
[AS_HELP_STRING([--disable-output-uhd], [Disable UHD output])],
[], [enable_output_uhd=yes])
-AS_IF([test "x$enable_kiss" = "xno"],
- [PKG_CHECK_MODULES([FFTW], [fftw3f], enable_fftw=yes, enable_fftw=no)],
- [enable_fftw=no])
-
-AS_IF([test "x$enable_fftw" = "xyes"],
- AC_MSG_NOTICE([Found FFTW3]),
- AC_MSG_NOTICE([Using Kiss FFT]) )
+PKG_CHECK_MODULES([FFTW], [fftw3f], enable_fftw=yes, enable_fftw=no)
echo "Checking zeromq"
@@ -103,22 +88,10 @@ AS_IF([test "x$enable_prof" != "xno"],
[EXTRA="$EXTRA -pg"])
# Define conditionals for Makefile.am
-AM_CONDITIONAL([USE_KISS_FFT], [test "x$enable_fftw" = "xno"])
AM_CONDITIONAL([DEBUG], [test "x$enable_trace" = "xyes"])
AM_CONDITIONAL([IS_GIT_REPO], [test -d '.git'])
# Defines for config.h
-AS_IF([test "x$enable_fft_simd" = "xyes"],
- [AC_DEFINE(USE_SIMD, [1], [Define to enable KISS FFT SIMD])])
-AS_IF([test "x$enable_fftw" = "xno"],
- [AC_DEFINE(USE_KISS_FFT, [1], [Define to enable KISS])])
-AS_IF([test "x$enable_fftw" = "xyes"],
- [AC_DEFINE(USE_FFTW, [1], [Define to enable FFTW])])
-
-AS_IF([test "x$enable_fftw" = "xno"],
- AC_MSG_ERROR([KISS FFT is currently broken. Please use FFTW. Any debugging help is appreciated]) )
-
-
AX_PTHREAD([], AC_MSG_ERROR([requires pthread]))
AC_SUBST([CFLAGS], ["$EXTRA $FFTW_CFLAGS $PTHREAD_CFLAGS"])
@@ -205,7 +178,7 @@ echo "***********************************************"
echo
enabled=""
disabled=""
-for feat in debug prof trace fftw fft_simd output_uhd zeromq
+for feat in debug prof trace output_uhd zeromq
do
eval var=\$enable_$feat
AS_IF([test "x$var" = "xyes"],