aboutsummaryrefslogtreecommitdiffstats
path: root/codecs
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-01-09 20:39:31 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-01-09 20:39:31 +0000
commit6d46449edefa31f740b2a7e0818ebf0a321628de (patch)
tree5970a3a64e0e2dd16b68c2a57424214cdafac649 /codecs
parent8b6c2c43bb0281236eb60948f45f5e1103eeeb4b (diff)
Handle speex subdirectories peroperly (bug #3283)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4739 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
-rwxr-xr-xcodecs/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/codecs/Makefile b/codecs/Makefile
index 07dc35343..61d9f1c3a 100755
--- a/codecs/Makefile
+++ b/codecs/Makefile
@@ -19,10 +19,11 @@
#MODG723=codec_g723_1.so codec_g723_1b.so
MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
-MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
+MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
CFLAGS+=-fPIC
CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
+CFLAGS+=$(shell [ -f /usr/local/include/speex/speex.h ] && echo "-I/usr/local/include/speex")
LIBG723=g723.1/libg723.a
LIBG723B=g723.1b/libg723b.a