From f55357cd0bcbc0a86f4ea9056584885897a8ec6c Mon Sep 17 00:00:00 2001 From: Diego Elio 'Flameeyes' Pettenò Date: Wed, 7 Oct 2009 19:30:11 +0200 Subject: Add check for FFTW, and add option to disable it at build-time. This way there will be a message at configure if FFTW is not found, and this gets in-line with the rest of the modules' dependencies. --- configure.ac | 10 ++++++++++ src/Makefile.am | 10 +++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index fd10c83e..77ec8846 100644 --- a/configure.ac +++ b/configure.ac @@ -1273,6 +1273,16 @@ AC_SUBST(OPENSSL_LIBS) AC_SUBST(HAVE_OPENSSL) AM_CONDITIONAL([HAVE_OPENSSL], [test "x$HAVE_OPENSSL" = x1]) +#### FFTW (optional) #### +AC_ARG_WITH( + [fftw], + AS_HELP_STRING([--without-fftw], [Omit FFTW-using modules (equalizer)])) + +if test "x${with_fftw}" != "xno"; then + PKG_CHECK_MODULES([FFTW], [fftw3f], [HAVE_FFTW=1], [HAVE_FFTW=0]) +fi +AM_CONDITIONAL([HAVE_FFTW], [test "x$HAVE_FFTW" = "x1"]) + ### Build and Install man pages ### AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages],[Disable building and installation of man pages]), diff --git a/src/Makefile.am b/src/Makefile.am index b277a9a3..c5d3ab7b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1017,7 +1017,6 @@ modlibexec_LTLIBRARIES += \ module-combine.la \ module-remap-sink.la \ module-ladspa-sink.la \ - module-equalizer-sink.la \ module-esound-sink.la \ module-tunnel-sink.la \ module-tunnel-source.la \ @@ -1195,6 +1194,11 @@ modlibexec_LTLIBRARIES += \ endif endif +if HAVE_FFTW +modlibexec_LTLIBRARIES += \ + module-equalizer-sink.la +endif + # These are generated by an M4 script SYMDEF_FILES = \ modules/module-cli-symdef.h \ @@ -1415,9 +1419,9 @@ module_ladspa_sink_la_LDFLAGS = $(MODULE_LDFLAGS) module_ladspa_sink_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la module_equalizer_sink_la_SOURCES = modules/module-equalizer-sink.c -module_equalizer_sink_la_CFLAGS = $(AM_CFLAGS) +module_equalizer_sink_la_CFLAGS = $(AM_CFLAGS) $(FFTW_CFLAGS) module_equalizer_sink_la_LDFLAGS = $(MODULE_LDFLAGS) -module_equalizer_sink_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) -lfftw3f libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la +module_equalizer_sink_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) $(FFTW_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la module_match_la_SOURCES = modules/module-match.c module_match_la_LDFLAGS = $(MODULE_LDFLAGS) -- cgit