configure --without-ilbc done

ILBC support is not really functionnal so the false the flag BUILD_ILBC is nerver defined

configure.ac

@@ -234,6 +234,14 @@ AS_IF([test "x$with_speex" != xno],
 AC_DEFINE([HAVE_SPEEX], test "x$with_speex" = "xyes", [Define if you have libspeex])
 AM_CONDITIONAL(BUILD_SPEEX, test "x$with_speex" = "xyes" )
 
+dnl Check for ilbc support
+AC_ARG_WITH([ilbc],
+  [AS_HELP_STRING([--without-ilbc],
+    [disable support for the ilbc codec])],
+  [],
+  [with_ilbc=no])
+
+AM_CONDITIONAL(BUILD_ILBC, test "x$with_ilbc" = "xyes" )
 
 dnl Check for IAX
 AC_ARG_WITH([iax2],

src/audio/Makefile.am

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

src/audio/codecDescriptor.cpp

@@ -297,6 +297,13 @@ CodecDescriptor::seemsValid( std::string lib)
       return false;
 #endif
 
+#ifdef BUILD_ILBC
+  // Nothing special
+#else
+    if( lib.substr(begin.length() , lib.length() - begin.length() - end.length()) == ILBC_STRING_DESCRIPTION )  
+      return false;
+#endif
+
   if(lib.substr(0, begin.length()) == begin)
     if(lib.substr(lib.length() - end.length() , end.length() ) == end)
       return true;

src/audio/codecs/Makefile.am

@@ -15,7 +15,16 @@ libcodec_speex_so_LDFLAGS = -shared -lc -lspeex
 INSTALL_SPEEX_RULE = install-libcodec_speex_so
 endif
 
-noinst_PROGRAMS = libcodec_ulaw.so libcodec_alaw.so $(GSM_LIB) $(SPEEX_LIB) libcodec_ilbc.so
+if BUILD_ILBC
+ILBC_LIB = libcodec_ilbc.so
+libcodec_ilbc_so_SOURCES = ilbc.cpp
+libcodec_ilbc_so_CFLAGS = -fPIC -g -Wall
+libcodec_ilbc_so_LDFLAGS = -shared ilbc/*.o -lc
+INSTALL_ILBC_RULE = install-libcodec_ilbc_so
+SUBDIRS = ilbc
+endif
+
+noinst_PROGRAMS = libcodec_ulaw.so libcodec_alaw.so $(GSM_LIB) $(SPEEX_LIB) $(ILBC_LIB) 
 
 noinst_HEADERS = audiocodec.h
 
@@ -27,13 +36,9 @@ libcodec_alaw_so_SOURCES = alaw.cpp
 libcodec_alaw_so_CFLAGS = -fPIC -g -Wall
 libcodec_alaw_so_LDFLAGS = -shared -lc
 
-libcodec_ilbc_so_SOURCES = ilbc.cpp
-libcodec_ilbc_so_CFLAGS = -fPIC -g -Wall
-libcodec_ilbc_so_LDFLAGS = -shared ilbc/*.o -lc
 
-SUBDIRS = ilbc
 
-install-exec-local:  install-libcodec_ulaw_so install-libcodec_alaw_so $(INSTALL_GSM_RULE) $(INSTALL_SPEEX_RULE) 
+install-exec-local:  install-libcodec_ulaw_so install-libcodec_alaw_so $(INSTALL_GSM_RULE) $(INSTALL_SPEEX_RULE) $(INSTALL_ILBC_RULE) 
 uninstall-local:  uninstall-libcodec_ulaw_so uninstall-libcodec_alaw_so uninstall-libcodec_gsm_so uninstall-libcodec_speex_so 
 
 install-libcodec_ulaw_so: libcodec_ulaw.so
@@ -45,8 +50,8 @@ install-libcodec_gsm_so: libcodec_gsm.so
 	$(INSTALL_PROGRAM)  libcodec_gsm.so $(sflcodecdir)
 install-libcodec_speex_so: libcodec_speex.so
 	$(INSTALL_PROGRAM)  libcodec_speex.so $(sflcodecdir)
-#install-libcodec_ilbc_so: libcodec_ilbc.so
-#	$(INSTALL_PROGRAM)  libcodec_ilbc.so $(sflcodecdir)
+install-libcodec_ilbc_so: libcodec_ilbc.so
+	$(INSTALL_PROGRAM)  libcodec_ilbc.so $(sflcodecdir)
 
 
 uninstall-libcodec_ulaw_so:
@@ -58,6 +63,6 @@ uninstall-libcodec_gsm_so:
 uninstall-libcodec_speex_so:
 	rm -f $(sflcodecdir)/libcodec_speex.so
 	rm -rf $(sflcodecdir)
-#uninstall-libcodec_ilbc_so:
-#	rm -f $(sflcodecdir)/libcodec_ilbc.so
+uninstall-libcodec_ilbc_so:
+	rm -f $(sflcodecdir)/libcodec_ilbc.so
 

src/global.h

@@ -103,6 +103,7 @@ typedef short int16;
 
 #define GSM_STRING_DESCRIPTION	  "gsm"
 #define SPEEX_STRING_DESCRIPTION  "speex"
+#define ILBC_STRING_DESCRIPTION  "ilbc"
 #define RINGTONE_ENABLED	  1
 
 #endif	// __GLOBAL_H__