configure --without-gsm done

If you disable gsm support, you dont need libgsm1-dev anymore

configure.ac

@@ -192,7 +192,7 @@ SFLPHONE_LIBS="$SFLPHONE_LIBS $libdbuscpp_LIBS"
 AC_CHECK_HEADER(boost/tokenizer.hpp, , AC_MSG_ERROR("Unable to find the libboost tokenizer headers; you may need to install the libboost-dev package" ) )
 
 # check for libgsm1 (doesn't use pkg-config)
-dnl Check for libspeex
+dnl Check for libgsm
 AC_ARG_WITH([gsm],
   [AS_HELP_STRING([--without-gsm],
     [disable support for gsm codec])],

src/audio/Makefile.am

@@ -8,6 +8,12 @@ else
 SPEEX_FLAG = 
 endif
 
+if BUILD_GSM
+GSM_FLAG = -DBUILD_GSM
+else
+GSM_FLAG = 
+endif
+
 SUBDIRS = codecs
 
 libaudio_la_SOURCES =    audiofile.cpp	 tonelist.cpp    \
@@ -16,7 +22,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)"\" $(SPEEX_FLAG)	
+ 	      -DCODECS_DIR=\""$(sflcodecdir)"\" $(SPEEX_FLAG) $(GSM_FLAG)	
 
 noinst_HEADERS = audioloop.h    common.h ringbuffer.h    audiofile.h  \
  tonelist.h         audiortp.h   audiolayer.h audiodevice.h \

src/audio/codecDescriptor.cpp

@@ -286,8 +286,14 @@ CodecDescriptor::seemsValid( std::string lib)
 #ifdef BUILD_SPEEX
   // Nothing special
 #else
-  std::string speex = "speex";
-    if( lib.substr(begin.length() , lib.length() - begin.length() - end.length()) == speex)
+    if( lib.substr(begin.length() , lib.length() - begin.length() - end.length()) == SPEEX_STRING_DESCRIPTION)
+      return false;
+#endif
+
+#ifdef BUILD_GSM
+  // Nothing special
+#else
+    if( lib.substr(begin.length() , lib.length() - begin.length() - end.length()) == GSM_STRING_DESCRIPTION )  
       return false;
 #endif
 

src/global.h

@@ -100,4 +100,7 @@ typedef short int16;
 #define	IAX2_ENABLED  false
 #endif
 
+#define GSM_STRING_DESCRIPTION	  "gsm"
+#define SPEEX_STRING_DESCRIPTION  "speex"
+
 #endif	// __GLOBAL_H__