diff --git a/debian/changelog b/debian/changelog index 317f41c1cebcbca9069762e759e741afdab73e7f..d0add3cf4a119ae9dcdf89101b038aa6133b86ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +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 ] diff --git a/globals.mak b/globals.mak index 005c52db0c3efe4937b04876db9bad640f8414af..832c65d78edca78ef83300de391f4b978c1d41ed 100644 --- a/globals.mak +++ b/globals.mak @@ -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) diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 613080582c687e06732d0c9ba2787e98c1310806..79067631540473b029b45392bb0398950640dcef 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -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 diff --git a/src/audio/codecDescriptor.cpp b/src/audio/codecDescriptor.cpp index d45d2edc1b06e3857b43cda974ffd140851a917f..1b927cfa1648644e0cf3a584b855979dac222658 100644 --- a/src/audio/codecDescriptor.cpp +++ b/src/audio/codecDescriptor.cpp @@ -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 ) diff --git a/src/audio/codecs/Makefile.am b/src/audio/codecs/Makefile.am index 8c7d4803848e93c0e4f47ee9f40ebfbe4d0dafc5..abdc514293ec94c13c0a5fd93c4eb44583963916 100644 --- a/src/audio/codecs/Makefile.am +++ b/src/audio/codecs/Makefile.am @@ -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)