Resurected the --enable-vorbis-psy option by linking with libspeexdsp…

… for the

fft.

configure.ac

@@ -202,6 +202,12 @@ AC_ARG_ENABLE(ti-c55x, [  --enable-ti-c55x        Enable support for TI C55X DSP
   AC_DEFINE([TI_C55X], , [Enable support for TI C55X DSP])
 fi])
 
+AC_ARG_ENABLE(vorbis-psy, [  --enable-psy    Enable the Vorbis psy model],
+[if test "$enableval" = yes; then
+  vorbis_psy=yes;
+  AC_DEFINE([VORBIS_PSYCHO], , [Enable support for the Vorbis psy model])
+fi])
+
 AC_ARG_WITH([fft], [AS_HELP_STRING([--with-fft=choice],[use an alternate FFT implementation. The available choices are
 kiss (default fixed point), smallft (default floating point), gpl-fftw3 and proprietary-intel-mkl])],
 [FFT=$withval]
@@ -239,6 +245,7 @@ AM_CONDITIONAL(BUILD_KISS_FFT, [test "$FFT" = "kiss"])
 AM_CONDITIONAL(BUILD_SMALLFT, [test "$FFT" = "smallft"])
 AC_SUBST(FFT_PKGCONFIG)
 
+AM_CONDITIONAL(BUILD_VORBIS_PSY, [test "x$vorbis_psy" = "xyes"])
 
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)

libspeex/Makefile.am

@@ -1,6 +1,13 @@
 # Disable automatic dependency tracking if using other tools than gcc and gmake
 #AUTOMAKE_OPTIONS = no-dependencies
 
+if BUILD_VORBIS_PSY
+  VPSY_LIB=libspeexdsp.la
+  VPSY_SOURCE=vorbis_psy.c
+else
+  VPSY_LIB=
+  VPSY_SOURCE=
+endif
 
 EXTRA_DIST=echo_diagnostic.m
 
@@ -9,7 +16,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
 lib_LTLIBRARIES = libspeex.la libspeexdsp.la
 
 # Sources for compilation in the library
-libspeex_la_SOURCES = 	cb_search.c 	exc_10_32_table.c 	exc_8_128_table.c \
+libspeex_la_SOURCES = 	$(VPSY_SOURCE) cb_search.c 	exc_10_32_table.c 	exc_8_128_table.c \
 		filters.c 	gain_table.c 	hexc_table.c 	high_lsp_tables.c 	lsp.c \
 		ltp.c 	speex.c 	stereo.c 	vbr.c 	vq.c bits.c exc_10_16_table.c \
 	exc_20_32_table.c exc_5_256_table.c exc_5_64_table.c gain_table_lbr.c hexc_10_32_table.c \
@@ -42,11 +49,11 @@ libspeexdsp_la_LDFLAGS = -no-undefined -version-info @SPEEX_LT_CURRENT@:@SPEEX_L
 
 noinst_PROGRAMS = testenc testenc_wb testenc_uwb testdenoise testecho testjitter
 testenc_SOURCES = testenc.c
-testenc_LDADD = libspeex.la
+testenc_LDADD = libspeex.la $(VPSY_LIB)
 testenc_wb_SOURCES = testenc_wb.c
-testenc_wb_LDADD = libspeex.la 
+testenc_wb_LDADD = libspeex.la  $(VPSY_LIB)
 testenc_uwb_SOURCES = testenc_uwb.c
-testenc_uwb_LDADD = libspeex.la
+testenc_uwb_LDADD = libspeex.la $(VPSY_LIB)
 testdenoise_SOURCES = testdenoise.c
 testdenoise_LDADD = libspeexdsp.la @FFT_LIBS@
 testecho_SOURCES = testecho.c

libspeex/vorbis_psy.c

@@ -39,6 +39,7 @@
 #include "smallft.h"
 #include "lpc.h"
 #include "vorbis_psy.h"
+#include "os_support.h"
 
 #include <stdlib.h>
 #include <math.h>

src/Makefile.am

@@ -5,6 +5,12 @@
 # Disable automatic dependency tracking if using other tools than gcc and gmake
 #AUTOMAKE_OPTIONS = no-dependencies
 
+if BUILD_VORBIS_PSY
+  VPSY_LIB=$(top_builddir)/libspeex/libspeexdsp.la
+else
+  VPSY_LIB=
+endif
+
 INCLUDES = -I$(top_builddir) @OGG_CFLAGS@
 
 man_MANS = speexenc.1 speexdec.1
@@ -21,5 +27,5 @@ speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la $(top_builddir)/libspeex/l
 	$(OGG_LIBS)  @FFT_LIBS@	
 
 speexdec_SOURCES = speexdec.c wav_io.c
-speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la \
+speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la $(VPSY_LIB) \
 	$(OGG_LIBS)  @FFT_LIBS@