changeset 12609:b81a7d1422d8

[gaim-migrate @ 14945] iLBC is not GPL compatible and is 100% optional... so it's gone. committer: Tailor Script <[e-mail]>

--- a/configure.ac	Thu Dec 22 00:41:35 2005 +0000
+++ b/configure.ac	Thu Dec 22 01:34:41 2005 +0000
@@ -1575,11 +1575,6 @@
 	VV_CFLAGS="$VV_CFLAGS $SPEEX_CFLAGS"
 	VV_LIBS="$VV_LIBS   $SPEEX_LIBS"
 
-	dnl check for installed ilbc codec
-	LP_CHECK_ILBC
-	VV_CFLAGS="$VV_CFLAGS $ILBC_CFLAGS"
-	VV_LIBS="$VV_LIBS   $ILBC_LIBS"
-
 	PKG_CHECK_MODULES(ORTP, ortp >= 0.7.1, enable_ortp=yes, enable_ortp=no)
 	VV_CFLAGS="$VV_CFLAGS $ORTP_CFLAGS"
 	VV_LIBS="$VV_LIBS   $ORTP_LIBS"

--- a/m4/ilbc.m4	Thu Dec 22 00:41:35 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-AC_DEFUN([LP_CHECK_ILBC],[
-
-AC_ARG_WITH( ilbc,
-      [  --with-ilbc      Set prefix where ilbc headers and libs can be found (ex:/usr, /usr/local, none to disable ilbc support) [default=/usr] ],
-      [ ilbc_prefix=${withval}],[ ilbc_prefix="/usr" ])
-
-if test "$ilbc_prefix" = "none" ; then
-	AC_MSG_NOTICE([iLBC codec support disabled. ])
-else
-	ILBC_CFLAGS=" -I${ilbc_prefix}/include/ilbc"
-	ILBC_LIBS="-L${ilbc_prefix}/lib -lilbc -lm"
-	CPPFLAGS_save=$CPPFLAGS
-	CPPFLAGS=$ILBC_CFLAGS
-	LDFLAGS_save=$LDFLAGS
-	LDFLAGS=$ILBC_LIBS
-	AC_CHECK_HEADERS(iLBC_decode.h,[AC_CHECK_LIB(ilbc,iLBC_decode,ilbc_found=yes,ilbc_found=no)
-	],ilbc_found=no)
-	
-	CPPFLAGS=$CPPFLAGS_save
-	LDFLAGS=$LDFLAGS_save
-	
-	if test "$ilbc_found" = "no" ; then
-		AC_MSG_WARN([Could not find ilbc headers or libs. Please install ilbc package from http://www.linphone.org if you want iLBC codec support in linphone.])
-		ILBC_CFLAGS=
-		ILBC_LIBS=
-	else
-		AC_DEFINE(HAVE_ILBC,1,[Defined when we have ilbc codec lib])
-		AC_SUBST(ILBC_CFLAGS)
-		AC_SUBST(ILBC_LIBS)
-	fi	
-fi
-
-])

--- a/src/media.c	Thu Dec 22 00:41:35 2005 +0000
+++ b/src/media.c	Thu Dec 22 01:34:41 2005 +0000
@@ -29,9 +29,6 @@
 
 #include "media.h"
 #include "mediastream.h"
-#ifdef HAVE_ILBC
-#include "msilbcdec.h"
-#endif
 
 
 /* msrtpsend.o and msrtprecv.o aren't used within the core, so
@@ -59,9 +56,6 @@
 void gaim_media_init()
 {
 	ms_init();
-#ifdef HAVE_ILBC
-	ms_ilbc_codec_init();
-#endif
 	ms_speex_codec_init();
 	ortp_init();
 }

--- a/src/mediastreamer/Makefile.am	Thu Dec 22 00:41:35 2005 +0000
+++ b/src/mediastreamer/Makefile.am	Thu Dec 22 01:34:41 2005 +0000
@@ -35,9 +35,7 @@
 							alsacard.c alsacard.h \
 							jackcard.c jackcard.h \
 							audiostream.c mediastream.h \
-							msspeexenc.c msspeexenc.h msspeexdec.c msspeexdec.h \
-							msilbcdec.c msilbcdec.h msilbcenc.c msilbcenc.h 
-
+							msspeexenc.c msspeexenc.h msspeexdec.c msspeexdec.h
 #							msGSMdecoder.c msGSMdecoder.h 
 #							msGSMencoder.c msGSMencoder.h
 #							msLPC10encoder.c msLPC10encoder.h