Speex dev - Dec 2009 - [PATCH] Link libspeexdsp with libfftw3 when needed

When built with --with-fft=gpl-fftw3, libspeexdsp is not linked with
libfftw3, while it uses symbols from it. This means every object linked
with libspeexdsp should also be linked with libfftw3, but it is not
something reflected in the pkgconfig file.

Instead, link libspeexdsp with libfftw3 when --with-fft=gpl-fftw3, and
remove explicit link with libfftw3 in objects build by the speex
Makefile.
---
 libspeex/Makefile.am |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libspeex/Makefile.am b/libspeex/Makefile.am
index 6eef924..c9d81dc 100644
--- a/libspeex/Makefile.am
+++ b/libspeex/Makefile.am
@@ -45,6 +45,7 @@ noinst_HEADERS = 	arch.h 	bfin.h cb_search_arm4.h 
cb_search_bfin.h 	cb_search_s
 
 
 libspeex_la_LDFLAGS = -no-undefined -version-info
@SPEEX_LT_CURRENT@:@SPEEX_LT_REVISION@:@SPEEX_LT_AGE@
+libspeexdsp_la_LIBADD = @FFT_LIBS@
 libspeexdsp_la_LDFLAGS = -no-undefined -version-info
@SPEEX_LT_CURRENT@:@SPEEX_LT_REVISION@:@SPEEX_LT_AGE@
 
 noinst_PROGRAMS = testenc testenc_wb testenc_uwb testdenoise testecho
testjitter
@@ -55,8 +56,8 @@ testenc_wb_LDADD = libspeex.la  $(VPSY_LIB)
 testenc_uwb_SOURCES = testenc_uwb.c
 testenc_uwb_LDADD = libspeex.la $(VPSY_LIB)
 testdenoise_SOURCES = testdenoise.c
-testdenoise_LDADD = libspeexdsp.la @FFT_LIBS@
+testdenoise_LDADD = libspeexdsp.la
 testecho_SOURCES = testecho.c
-testecho_LDADD = libspeexdsp.la @FFT_LIBS@
+testecho_LDADD = libspeexdsp.la
 testjitter_SOURCES = testjitter.c
-testjitter_LDADD = libspeexdsp.la @FFT_LIBS@
+testjitter_LDADD = libspeexdsp.la
-- 
1.6.5.3