[asterisk-commits] branch group/autoconf_and_menuselect r22074 - in /team/group/autoconf_and_men...

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Fri Apr 21 14:58:01 2006
New Revision: 22074

URL: http://svn.digium.com/view/asterisk?rev=22074&view=rev
Log:
use configure-script found info for Speex library

Modified:
    team/group/autoconf_and_menuselect/codecs/Makefile
    team/group/autoconf_and_menuselect/codecs/codec_speex.c
    team/group/autoconf_and_menuselect/configure.ac

Modified: team/group/autoconf_and_menuselect/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/codecs/Makefile?rev=22074&r1=22073&r2=22074&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/codecs/Makefile (original)
+++ team/group/autoconf_and_menuselect/codecs/Makefile Fri Apr 21 14:58:01 2006
@@ -24,15 +24,6 @@
 ifneq ($(wildcard g723.1b/coder2.c),)
   MODS+=codec_g723_1b.so
   LIBG723B=g723.1b/libg723b.a
-endif
-
-SPEEX_PATH:=/usr/local/include /usr/include /usr/include/speex /usr/local/include/speex
-SPEEX_SYSTEM_HEADERS:=$(firstword $(wildcard $(SPEEX_PATH:%=$(CROSS_COMPILE_TARGET)%/speex.h)))
-ifeq ($(SPEEX_SYSTEM_HEADERS),)
-  MODS:=$(filter-out codec_speex.so,$(MODS))
-else
-  CFLAGS+=-I$(subst /speex.h,,$(SPEEX_SYSTEM_HEADERS))
-  LIBSPEEX=-lspeex -lm
 endif
 
 ifeq ($(wildcard ilbc/iLBC_decode.h),)
@@ -97,8 +88,11 @@
 	$(CC) $(SOLINK) -o $@ $< $(GSM_LIB)
 endif
 
+codec_speex.o: codec_speex.c
+	$(CC) -c -o $@ $(CFLAGS) $(SPEEX_INCLUDE) $<
+
 codec_speex.so: codec_speex.o
-	$(CC) $(SOLINK) -o $@ $< $(LIBSPEEX)
+	$(CC) $(SOLINK) -o $@ $< $(SPEEX_LIB)
 
 codec_lpc10.so: codec_lpc10.o $(LIBLPC10)
 	$(CC) $(SOLINK) -o $@ $< $(LIBLPC10) -lm

Modified: team/group/autoconf_and_menuselect/codecs/codec_speex.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/codecs/codec_speex.c?rev=22074&r1=22073&r2=22074&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/codecs/codec_speex.c (original)
+++ team/group/autoconf_and_menuselect/codecs/codec_speex.c Fri Apr 21 14:58:01 2006
@@ -37,7 +37,7 @@
 #include <netinet/in.h>
 #include <string.h>
 #include <stdio.h>
-#include <speex.h>
+#include <speex/speex.h>
 
 /* We require a post 1.1.8 version of Speex to enable preprocessing
    and better type handling */   

Modified: team/group/autoconf_and_menuselect/configure.ac
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/configure.ac?rev=22074&r1=22073&r2=22074&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/configure.ac (original)
+++ team/group/autoconf_and_menuselect/configure.ac Fri Apr 21 14:58:01 2006
@@ -162,7 +162,7 @@
 AST_EXT_LIB([asound], [snd_spcm_init], [ALSA], [Advanced Linux Sound Architecture], [-lm -ldl])
 AST_EXT_LIB([nbs], [nbs_setup], [NBS], [Network Broadcast Sound])
 AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [OSS], [Open Sound System])
-AST_EXT_LIB([speex], [speex_encode], [SPEEX], [Speex])
+AST_EXT_LIB([speex], [speex_encode], [SPEEX], [Speex], [-lm])
 AST_EXT_LIB([tonezone], [tone_zone_find], [ZAPTEL], [Zaptel])
 AST_EXT_LIB([pri], [pri_call], [LIBPRI], [ISDN PRI])
 AST_EXT_LIB([mfcr2], [mfcr2_MakeCall], [MFCR2], [MFCR2])