look in /usr/include/speex for speex.h (bug #3761)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@5186 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CHANGES b/CHANGES
index 08d6997a30b950dfade3a6bfa91507224c1c5854..2d579e71822f0581af098d57467abacbda982bc2 100755 (executable)
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,8 @@ Asterisk 1.0.7
     -- A check has been added to avoid a crash.
  -- app_voicemail
     -- Some checks have been added to avoid a crash.
+ -- speex
+    -- The path /usr/include/speex has been added for a place to look for the speex header.
 
 Asterisk 1.0.6
 

diff --git a/codecs/Makefile b/codecs/Makefile
index 9a3dc8c28eaae2a91aa267d6ac005f97de72183e..e7aa6b91a00596aa1f9522139f7d14fda6e734c4 100755 (executable)
--- a/codecs/Makefile
+++ b/codecs/Makefile
@@ -19,11 +19,12 @@
 #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 ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
+MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/include/speex/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")
+CFLAGS+=$(shell [ -f /usr/include/speex/speex.h ] && echo "-I/usr/include/speex")
 
 LIBG723=g723.1/libg723.a
 LIBG723B=g723.1b/libg723b.a