configure --without-speex done

If the flag --without-speex is passed to configure, you dont need libspeex-dev package

src/audio/Makefile.am

@@ -2,6 +2,12 @@ sflcodecdir = $(libdir)/sflphone/codecs
 
 noinst_LTLIBRARIES = libaudio.la
 
+if BUILD_SPEEX
+SPEEX_FLAG = -DBUILD_SPEEX
+else
+SPEEX_FLAG = 
+endif
+
 SUBDIRS = codecs
 
 libaudio_la_SOURCES =    audiofile.cpp	 tonelist.cpp    \
@@ -10,8 +16,7 @@ tonegenerator.cpp   codecDescriptor.cpp \
 audioloop.cpp ringbuffer.cpp $(SPEEX_SOURCES_CPP)
 
 AM_CXXFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libs $(libccext2_CFLAGS) $(libdbuscpp_CFLAGS) $(libccrtp1_CFLAGS) $(USER_INCLUDES) \
- 	      -DCODECS_DIR=\""$(sflcodecdir)"\"	
-libaudio_la_CPPFLAGS = $(SPEEX_FLAG)
+ 	      -DCODECS_DIR=\""$(sflcodecdir)"\" $(SPEEX_FLAG)	
 
 noinst_HEADERS = audioloop.h    common.h ringbuffer.h    audiofile.h  \
  tonelist.h         audiortp.h   audiolayer.h audiodevice.h \

src/audio/codecDescriptor.cpp

@@ -283,6 +283,14 @@ CodecDescriptor::seemsValid( std::string lib)
   std::string begin = SFL_CODEC_VALID_PREFIX;
   std::string end = SFL_CODEC_VALID_EXTEN;
 
+#ifdef BUILD_SPEEX
+  // Nothing special
+#else
+  std::string speex = "speex";
+    if( lib.substr(begin.length() , lib.length() - begin.length() - end.length()) == speex)
+      return false;
+#endif
+
   if(lib.substr(0, begin.length()) == begin)
     if(lib.substr(lib.length() - end.length() , end.length() ) == end)
       return true;

src/managerimpl.cpp

@@ -1122,7 +1122,6 @@ ManagerImpl::retrieveActiveCodecs()
   tokenizer tokens(s, slash); 
   for(tokenizer::iterator tok_iter = tokens.begin(); tok_iter!= tokens.end(); ++tok_iter)
   {
-    printf("%s\n", (*tok_iter).c_str());
     order.push_back(*tok_iter);
   }
   return order;