[SCM] calf/master: Use srfftw instead of rfftw - the latter is not present on some systems (like Arch).

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cd8b81479545863a74d75d9b3193108d9226302f
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Sat Aug 25 15:43:06 2012 +0100

    Use srfftw instead of rfftw - the latter is not present on some systems (like Arch).

diff --git a/configure.ac b/configure.ac
index 22a7632..3e793f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,8 +50,8 @@ AC_CHECK_HEADERS([memory.h stdint.h stdlib.h string.h time.h math.h])
 
 AC_CHECK_HEADER(expat.h, true, AC_MSG_ERROR([Expat XML library not found]))
 AC_CHECK_LIB(expat, XML_Parse, true, AC_MSG_ERROR([Expat XML library not found]))
-AC_CHECK_HEADER(rfftw.h, true, AC_MSG_ERROR([FFTW2 header (rfftw.h) not found]))
-AC_CHECK_LIB(rfftw, true, AC_MSG_ERROR([FFTW2 library (librfftw) not found]))
+AC_CHECK_HEADER(srfftw.h, true, AC_MSG_ERROR([Single-precision FFTW2 header (srfftw.h) not found]))
+AC_CHECK_LIB(srfftw, true, AC_MSG_ERROR([Single-precision FFTW2 library (libsrfftw) not found]))
 
 # JACK
 AC_CHECK_HEADERS([jack/jack.h], have_jack_header=yes, have_jack_header=no)
diff --git a/src/Makefile.am b/src/Makefile.am
index 5abcac6..cdc27c7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,7 @@ AM_CXXFLAGS += $(JACK_DEPS_CFLAGS)
 noinst_LTLIBRARIES += libcalfgui.la
 bin_PROGRAMS += calfjackhost 
 calfjackhost_SOURCES = gtk_session_env.cpp host_session.cpp jack_client.cpp jackhost.cpp gtk_main_win.cpp session_mgr.cpp
-calfjackhost_LDADD = libcalfgui.la calf.la $(JACK_DEPS_LIBS) $(GUI_DEPS_LIBS) $(GLIB_DEPS_LIBS) $(FLUIDSYNTH_DEPS_LIBS) -lrfftw -lfftw
+calfjackhost_LDADD = libcalfgui.la calf.la $(JACK_DEPS_LIBS) $(GUI_DEPS_LIBS) $(GLIB_DEPS_LIBS) $(FLUIDSYNTH_DEPS_LIBS) -lsrfftw -lfftw
 if USE_LASH
 AM_CXXFLAGS += $(LASH_DEPS_CFLAGS)
 calfjackhost_LDADD += $(LASH_DEPS_LIBS)
@@ -35,14 +35,14 @@ calfmakerdf_SOURCES = makerdf.cpp
 calfmakerdf_LDADD = calf.la
 
 calfbenchmark_SOURCES = benchmark.cpp
-calfbenchmark_LDADD = $(GLIB_DEPS_LIBS) -lrfftw calf.la
+calfbenchmark_LDADD = $(GLIB_DEPS_LIBS) -lsrfftw calf.la
 
 calf_la_SOURCES = audio_fx.cpp metadata.cpp modules.cpp modules_comp.cpp modules_limit.cpp modules_dist.cpp modules_eq.cpp modules_mod.cpp fluidsynth.cpp giface.cpp monosynth.cpp organ.cpp osctl.cpp plugin.cpp preset.cpp synth.cpp utils.cpp wavetable.cpp modmatrix.cpp 
 calf_la_LIBADD ?= $(FLUIDSYNTH_DEPS_LIBS)
 if USE_DEBUG
-calf_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -disable-static $(FLUIDSYNTH_DEPS_LIBS) -lrfftw -lfftw
+calf_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -disable-static $(FLUIDSYNTH_DEPS_LIBS) -lsrfftw -lfftw
 else
-calf_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor"  $(FLUIDSYNTH_DEPS_LIBS) -lrfftw -lfftw
+calf_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor"  $(FLUIDSYNTH_DEPS_LIBS) -lsrfftw -lfftw
 endif
 
 if USE_LV2_GUI
diff --git a/src/calf/modules.h b/src/calf/modules.h
index 8570214..c9f8926 100644
--- a/src/calf/modules.h
+++ b/src/calf/modules.h
@@ -21,7 +21,7 @@
 #ifndef CALF_MODULES_H
 #define CALF_MODULES_H
 
-#include "rfftw.h"
+#include "srfftw.h"
 #include <assert.h>
 #include <limits.h>
 #include "biquad.h"
diff --git a/src/modules.cpp b/src/modules.cpp
index 2728a0d..4423252 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -21,7 +21,7 @@
 #include <limits.h>
 #include <memory.h>
 #include <math.h>
-#include <rfftw.h>
+#include <srfftw.h>
 #include <calf/giface.h>
 #include <calf/modules.h>
 #include <calf/modules_dev.h>

-- 
calf audio plugins packaging