Commit a454fd63 authored by Emmanuel Milou's avatar Emmanuel Milou

Merge branch 'release'

parents e9a8d2a4 4b9c738f
sflphone (0.9.4-0ubuntu2) %system%; urgency=low
[ Alexandre Savard ]
* Restore speex and GSM detection
[ Emmanuel Milou ]
* Fix bug #1090
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 8 Apr 2009 11:29:15 -0500
sflphone (0.9.4-0ubuntu1) %system%; urgency=low
[ Emmanuel Milou ]
......
......@@ -7,6 +7,18 @@ PJSIP_LIBS = -lpjnath-sfl -lpjsua-sfl -lpjsip-sfl -lpjmedia-sfl -lpjsip-simple-s
DBUSCPP_CFLAGS=$(top_srcdir)/libs/dbus-c++/include/dbus-c++
if BUILD_SPEEX
SPEEXCODEC=-DHAVE_SPEEX_CODEC
else
SPEEXCODEC=
endif
if BUILD_GSM
GSMCODEC=-DHAVE_GSM_CODEC
else
GSMCODEC=
endif
# Preprocessor flags
AM_CPPFLAGS = \
-I$(src)/libs \
......@@ -23,5 +35,6 @@ AM_CPPFLAGS = \
-DCODECS_DIR=\""$(sflcodecdir)"\" \
-DPLUGINS_DIR=\""$(sflplugindir)"\" \
-DENABLE_TRACE \
-DSFLDEBUG
-DSFLDEBUG \
$(SPEEXCODEC) \
$(GSMCODEC)
......@@ -2,17 +2,6 @@ include $(top_srcdir)/globals.mak
noinst_LTLIBRARIES = libaudio.la
if BUILD_SPEEX
SPEEX_FLAG = -DBUILD_SPEEX
else
SPEEX_FLAG =
endif
if BUILD_GSM
GSM_FLAG = -DBUILD_GSM
else
GSM_FLAG =
endif
if BUILD_ILBC
ILBC_FLAG = -DBUILD_ILBC
......
......@@ -277,14 +277,14 @@ CodecDescriptor::seemsValid( std::string lib)
return false;
#ifdef HAVE_SPEEX
#ifdef HAVE_SPEEX_CODEC
// Nothing special
#else
if( lib.substr(begin.length() , lib.length() - begin.length() - end.length()) == SPEEX_STRING_DESCRIPTION)
return false;
#endif
#ifdef HAVE_GSM
#ifdef HAVE_GSM_CODEC
// Nothing special
#else
if( lib.substr(begin.length() , lib.length() - begin.length() - end.length()) == GSM_STRING_DESCRIPTION )
......
......@@ -10,11 +10,11 @@ INSTALL_GSM_RULE = install-libcodec_gsm_so
endif
if ENABLE_SPEEXDSP
SPEEXDSP= -DHAVE_SPEEXDSP_LIB
SPEEXDSP=-DHAVE_SPEEXDSP_LIB
endif
if BUILD_SPEEX
SPEEX_LIB = libcodec_speex.so
SPEEX_LIB=libcodec_speex.so
libcodec_speex_so_SOURCES = speexcodec.cpp
libcodec_speex_so_CFLAGS = -fPIC -g -Wall
libcodec_speex_so_CXXFLAGS = -fPIC -g -Wall $(SPEEXDSP)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment