[SCM] calf/master: Add dependency on FFTW2. Note: this makes the resulting binary GPL-licensed.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4dc92e0ac06aa9d4dc40b36ba1c3b1f82854dd60
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Wed Feb 22 11:20:47 2012 +0000

    Add dependency on FFTW2. Note: this makes the resulting binary GPL-licensed.

diff --git a/configure.ac b/configure.ac
index 5e62ba4..530ed77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +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]))
 
 # JACK
 AC_CHECK_HEADERS([jack/jack.h], have_jack_header=yes, have_jack_header=no)
@@ -221,6 +223,11 @@ fi
 AC_MSG_RESULT([    Old-style JACK MIDI:         $OLD_JACK
     
     Installation prefix:         $prefix
+    
+    Note: due to usage of GPL-licensed libraries (FFTW) in this version,
+    the linked binary will be covered by GPL, even though the source is
+    LGPL-licensed. The only way to get an LGPL binary is by removing
+    or reimplementing parts that depend on FFTW.
 ])
 
 if test "$SLV2_UNSUPPORTED" == "yes" -a "$LV2_ENABLED" == "yes"; then 
diff --git a/src/Makefile.am b/src/Makefile.am
index f50fc9f..54c1bef 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) $(FLUIDSYNTH_DEPS_LIBS)
+calfjackhost_LDADD = libcalfgui.la calf.la $(JACK_DEPS_LIBS) $(GUI_DEPS_LIBS) $(FLUIDSYNTH_DEPS_LIBS) -lrfftw -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) calf.la
+calfbenchmark_LDADD = $(GLIB_DEPS_LIBS) -lrfftw 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)
+calf_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -disable-static $(FLUIDSYNTH_DEPS_LIBS) -lrfftw -lfftw
 else
-calf_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor"  $(FLUIDSYNTH_DEPS_LIBS)
+calf_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor"  $(FLUIDSYNTH_DEPS_LIBS) -lrfftw -lfftw
 endif
 
 if USE_LV2_GUI

-- 
calf audio plugins packaging