From dc46c78d0ab052228721d795942a4d33ebec6399 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 16 Jun 2008 10:38:52 +0000 Subject: [PATCH] added libfftw3-detection git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1154 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 4 ++++ configure.in | 52 ++++++++++++++++++++++++++++++++------------- plugins/Makefile.am | 6 +++++- 3 files changed, 46 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1261d9e6..5b89072ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-06-16 Tobias Doerffel + * plugins/Makefile.am: + * configure.in: + added libfftw3-detection + * plugins/bass_booster/bassbooster_control_dialog.cpp: * plugins/bass_booster/artwork.png: * plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp: diff --git a/configure.in b/configure.in index a550aea3b..7f6f11ce3 100644 --- a/configure.in +++ b/configure.in @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.50) -AC_INIT(lmms, 0.4.0-svn20080613, lmms-devel/at/lists/dot/sf/dot/net) -AM_INIT_AUTOMAKE(lmms, 0.4.0-svn20080613) +AC_INIT(lmms, 0.4.0-svn20080616, lmms-devel/at/lists/dot/sf/dot/net) +AM_INIT_AUTOMAKE(lmms, 0.4.0-svn20080616) AX_PREFIX_CONFIG_H([include/lmmsconfig.h]) AM_CONFIG_HEADER(config.h) @@ -480,6 +480,24 @@ fi +# check for fftw3-lib +AC_ARG_WITH(fftw3, + AS_HELP_STRING([--without-fftw3], + [disable support for FFTW3]), , + [ with_fftw3=yes ]) +AH_TEMPLATE(HAVE_FFTW3_H, [Define to 1 if you have the header file.]) +if test "x$with_fftw3" = "xyes" ; then + AC_CHECK_HEADER(fftw3.h, HAVE_FFTW3_H="true") + AC_CHECK_LIB([fftw3], [fftw_execute], HAVE_LIBFFTW3="true", HAVE_FFTW3_H="") +fi +if test ! -z "$HAVE_FFTW3_H" ; then + AC_DEFINE(HAVE_FFTW3_H) +fi +AM_CONDITIONAL(HAVE_LIBFFTW3, test ! -z "$HAVE_FFTW3_H") + + + + # check whether to disable surround-support AC_MSG_CHECKING([whether to disable surround-support]) AH_TEMPLATE(DISABLE_SURROUND, [Define if you want to disable surround-support in LMMS.]) @@ -495,19 +513,6 @@ else fi -# check whether to enable high-quality sinc-resampling -AC_MSG_CHECKING([whether to enable high quality sinc-resampling]) -AH_TEMPLATE(HQ_SINC, [Define if you want to enable high quality sinc-resampling.]) -AC_ARG_ENABLE([hqsinc], - AS_HELP_STRING([--enable-hqsinc], - [enable high quality sinc-resampling]), [HQ_SINC=$enableval]) -if test "x$HQ_SINC" = "xyes" ; then - AC_MSG_RESULT(yes) - AC_DEFINE(HQ_SINC) -else - AC_MSG_RESULT(no) -fi - # check whether to disable single-source-compile #AC_MSG_CHECKING([whether to enable single-source-compile]) # AH_TEMPLATE(SINGLE_SOURCE_COMPILE, [Define if you want to enable single-source-compile.]) @@ -971,6 +976,23 @@ fi +if test -z "$HAVE_FFTW3_H" ; then + echo " ========================" + echo " === LMMS - WARNING =======================================================" + echo " ========================" + echo " =" + echo " = You don't seem to have FFTW3-library installed and/or FFTW3-development-" + echo " = package (Debian/Ubuntu: libfftw3-dev) is missing. Without this package, the" + echo " = Spectrum Analyzer plugin won't be built." + echo " = Consider installing the missing packages for using the full power of LMMS." + echo " =" + with_warnings="true" +else + PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* Spectrum Analyzer plugin" +fi + + + if test ! -z "$WINECXX" ; then PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* LMMS VST Support Layer (LVSL) for built-in VST-plugin usage" else diff --git a/plugins/Makefile.am b/plugins/Makefile.am index aaff43a88..e78f1ac0f 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -14,6 +14,10 @@ if FLUIDSYNTH_SUPPORT SF2PLAYER_DIR=sf2_player endif +if HAVE_LIBFFTW3 +SPECTRUMANALYZER_DIR=spectrum_analyzer +endif + SUBDIRS = \ audio_file_processor \ bass_booster \ @@ -30,7 +34,7 @@ SUBDIRS = \ peak_controller_effect \ $(SF2PLAYER_DIR) \ $(SINGERBOT_DIR) \ - spectrum_analyzer \ + $(SPECTRUMANALYZER_DIR) \ stereo_enhancer \ stereo_matrix \ $(STK_DIR) \