Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/xiph/speex.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Marc Valin <jean-marc.valin@octasic.com>2009-04-15 22:19:04 +0400
committerJean-Marc Valin <jean-marc.valin@octasic.com>2009-04-15 22:19:04 +0400
commit05f7c6f0cb71a2307e074d3a51a9c1e058ee4903 (patch)
tree9faa89a6f534a51112eebd984ec5f1f5c5bb5597 /src
parente34614cc90114da57ace4108dac0cc20e13b1b8e (diff)
Resurected the --enable-vorbis-psy option by linking with libspeexdsp for the
fft.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index d955d06..1b5dfb4 100644
--- a/src/Makefile.am
+++ b/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@