mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add check for FFTW, and add option to disable it at build-time.

Browse source 
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.
This commit is contained in:
Diego Elio 'Flameeyes' Pettenò 2009-10-07 19:30:11 +02:00
parent b64b6bbf4c
commit f55357cd0b
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
configure.ac
View file

@ -1273,6 +1273,16 @@ AC_SUBST(OPENSSL_LIBS)
AC_SUBST(HAVE_OPENSSL) AC_SUBST(HAVE_OPENSSL)
AM_CONDITIONAL([HAVE_OPENSSL], [test "x$HAVE_OPENSSL" = x1]) 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 ### ### Build and Install man pages ###
AC_ARG_ENABLE(manpages, AC_ARG_ENABLE(manpages,
AS_HELP_STRING([--disable-manpages],[Disable building and installation of man pages]), AS_HELP_STRING([--disable-manpages],[Disable building and installation of man pages]),

10
src/Makefile.am
View file

@ -1017,7 +1017,6 @@ modlibexec_LTLIBRARIES += \
module-combine.la \ module-combine.la \
module-remap-sink.la \ module-remap-sink.la \
module-ladspa-sink.la \ module-ladspa-sink.la \
module-equalizer-sink.la \
module-esound-sink.la \ module-esound-sink.la \
module-tunnel-sink.la \ module-tunnel-sink.la \
module-tunnel-source.la \ module-tunnel-source.la \
@ -1195,6 +1194,11 @@ modlibexec_LTLIBRARIES += \
endif endif
endif endif
if HAVE_FFTW
modlibexec_LTLIBRARIES += \
module-equalizer-sink.la
endif
# These are generated by an M4 script # These are generated by an M4 script
SYMDEF_FILES = \ SYMDEF_FILES = \
modules/module-cli-symdef.h \ 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_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_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_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_SOURCES = modules/module-match.c
module_match_la_LDFLAGS = $(MODULE_LDFLAGS) module_match_la_LDFLAGS = $(MODULE_LDFLAGS)