--- kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am~	2006-10-01 21:26:45 +0400
+++ kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am	2007-08-30 19:53:27 +0400
@@ -85,7 +85,7 @@ noinst_HEADERS = affine.h \
 			      sndcard.h
 
 
-libmediastreamer_la_LIBADD= $(GLIB_LIBS) $(ORTP_LIBS) $(SPEEX_LIBS)
+libmediastreamer_la_LIBADD= $(GLIB_LIBS) $(SPEEX_LIBS)
 
 AM_CFLAGS=$(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" $(ORTP_CFLAGS) $(IPV6_CFLAGS) $(ILBC_CFLAGS) $(SPEEX_CFLAGS)
 
--- kdenetwork-3.5.7/kopete/protocols/jabber/jingle/Makefile.am~	2006-10-01 21:26:45 +0400
+++ kdenetwork-3.5.7/kopete/protocols/jabber/jingle/Makefile.am	2007-08-30 19:56:59 +0400
@@ -25,4 +25,4 @@ libkopetejabberjingle_la_LIBADD = libjin
 	libjingle/talk/xmllite/libcricketxmllite.la \
 	libjingle/talk/base/libcricketbase.la \
 	libjingle/talk/third_party/mediastreamer/libmediastreamer.la  \
-	$(EXPAT_LIBS) $(ORTP_LIBS) -lpthread $(ILBC_LIBS) $(SPEEX_LIBS) $(GLIB_LIBS) $(ALSA_LIBS)
+	$(EXPAT_LIBS) -lpthread $(ILBC_LIBS) $(SPEEX_LIBS) $(GLIB_LIBS) $(ALSA_LIBS)
--- kdenetwork-3.5.7/kopete/protocols/jabber/Makefile.am.jingle	2007-08-09 19:45:17 +0400
+++ kdenetwork-3.5.7/kopete/protocols/jabber/Makefile.am	2007-08-09 19:44:12 +0400
@@ -1,6 +1,6 @@
 if include_jingle
 JINGLE=jingle
-JINGLE_LIBS=jingle/libkopetejabberjingle.la
+JINGLE_LIBS=jingle/libkopetejabberjingle.la $(ORTP_LIBS)
 JINGLE_INCLUDES=-I$(srcdir)/jingle -I$(top_builddir)/kopete/protocols/jabber/jingle
 endif
 
--- kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h.jingle	2007-08-09 19:36:27 +0400
+++ kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h	2007-08-09 19:36:40 +0400
@@ -23,7 +23,7 @@
 #define MSSPEEXDEC_H
 
 #include <mscodec.h>
-#include <speex.h>
+#include <speex/speex.h>
 
 struct _MSSpeexDec
 {
--- kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h.jingle	2007-08-09 19:39:12 +0400
+++ kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h	2007-08-09 19:39:26 +0400
@@ -23,7 +23,7 @@
 #define MSSPEEXENC_H
 
 #include <mscodec.h>
-#include <speex.h>
+#include <speex/speex.h>
 
 struct _MSSpeexEnc
 {
--- kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc.jingle	2006-10-01 21:26:44 +0400
+++ kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc	2007-08-29 14:37:25 +0400
@@ -1,6 +1,6 @@
 #include <portaudio.h>
 #include <ortp/ortp.h>
-#include <speex.h>
+#include <speex/speex.h>
 
 // Socket stuff
 #ifndef _WIN32
--- kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h.jingle	2006-10-01 21:26:44 +0400
+++ kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h	2007-08-29 14:37:45 +0400
@@ -2,7 +2,7 @@
 #define PORTAUDIOMEDIAENGINE_H
 
 #include <portaudio.h>
-#include <speex.h>
+#include <speex/speex.h>
 #include <ortp/ortp.h>
 
 #include "talk/session/phone/mediaengine.h"