From kde-commits  Sat Dec 31 22:23:28 2005
From: =?utf-8?q?Micha=C3=ABl=20Larouche?= <michael.larouche () kdemail ! net>
Date: Sat, 31 Dec 2005 22:23:28 +0000
To: kde-commits
Subject: branches/work/kopete/dev-0.12/kopete/protocols/jabber
Message-Id: <1136067808.747865.14541.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=113606782007624

SVN commit 492991 by mlarouche:

Fix SPEEX include problem on my machine.

Include config.h in code that check for SUPPORT_JINGLE macro.




 M  +4 -0      jabberaccount.h  
 M  +4 -0      jabbercontact.h  
 M  +6 -0      jingle/configure.in.in  
 M  +1 -1      jingle/libjingle/talk/session/phone/Makefile.am  
 M  +1 -1      jingle/libjingle/talk/third_party/mediastreamer/Makefile.am  


--- branches/work/kopete/dev-0.12/kopete/protocols/jabber/jabberaccount.h #492990:492991
@@ -23,6 +23,10 @@
 #ifndef JABBERACCOUNT_H
 #define JABBERACCOUNT_H
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 // we need these for type reasons
 #include <kopetepasswordedaccount.h>
 #include <kopeteonlinestatus.h>
--- branches/work/kopete/dev-0.12/kopete/protocols/jabber/jabbercontact.h #492990:492991
@@ -18,6 +18,10 @@
 #ifndef JABBERCONTACT_H
 #define JABBERCONTACT_H
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "jabberbasecontact.h"
 #include "xmpp_vcard.h"
 
--- branches/work/kopete/dev-0.12/kopete/protocols/jabber/jingle/configure.in.in #492990:492991
@@ -40,12 +40,18 @@
 AC_SUBST(ORTP_CFLAGS)
 AC_SUBST(ORTP_LIBS)
 
+AC_ARG_WITH( speex,
+      [  --with-speex      Set prefix where speex lib can be found (ex:/usr, /usr/local) [default=/usr] ],
+      [ speex_prefix=${withval}],[ speex_prefix="/usr" ])
+
 PKG_CHECK_MODULES(SPEEX, speex, speex_found=yes, speex_found=no)
+AC_CHECK_HEADERS(speex.h,[AC_CHECK_LIB(speex,speex_encode_int,speex_found=yes,speex_found=no)],speex_found=no)
 AC_CHECK_HEADERS(speex/speex.h,[AC_CHECK_LIB(speex,speex_encode_int,speex_found=yes,speex_found=no)],speex_found=no)
 
 if test x$speex_found = xno; then
 	AC_MSG_WARN([Could not find a libspeex version that have the speex_encode_int() function. Please install libspeex=1.0.5 or libspeex>=1.1.6 from http://www.speex.org/])
 else
+	SPEEX_CFLAGS="$SPEEX_CFLAGS -I${speex_prefix}/include -I${speex_prefix}/include/speex"
 	AC_SUBST(SPEEX_CFLAGS)
 	AC_SUBST(SPEEX_LIBS)
 	AC_DEFINE(HAVE_SPEEX,1,[has speex])
--- branches/work/kopete/dev-0.12/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile.am #492990:492991
@@ -14,7 +14,7 @@
                                     call.h \
 				    mediachannel.h 
 
-AM_CPPFLAGS := -DPOSIX $(ORTP_CFLAGS) $(ILBC_CFLAGS) -I$(srcdir)/../../../talk/third_party/mediastreamer $(GLIB_CFLAGS)
+AM_CPPFLAGS := -DPOSIX $(ORTP_CFLAGS) $(ILBC_CFLAGS) -I$(srcdir)/../../../talk/third_party/mediastreamer $(GLIB_CFLAGS) $(SPEEX_CFLAGS)
 noinst_LTLIBRARIES = libcricketsessionphone.la
 				    
 DEFAULT_INCLUDES = -I$(srcdir)/../../..
\ No newline at end of file
--- branches/work/kopete/dev-0.12/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am #492990:492991
@@ -85,7 +85,7 @@
 			      sndcard.h
 
 
-libmediastreamer_la_LIBADD= $(GLIB_LIBS) $(ORTP_LIBS)
+libmediastreamer_la_LIBADD= $(GLIB_LIBS) $(ORTP_LIBS) $(SPEEX_LIBS)
 
 AM_CFLAGS=$(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" $(ORTP_CFLAGS) $(IPV6_CFLAGS) $(ILBC_CFLAGS) $(SPEEX_CFLAGS)