--- kphoneSI_1.0/configure.orig 2006-06-17 20:09:53.000000000 +0200 +++ kphoneSI_1.0/configure 2006-06-17 20:10:05.000000000 +0200 @@ -2162,7 +2162,7 @@ if test "$enable_srtp" = "yes"; then - srtp_make="srtp/Makefile" + srtp_make="srtp-1.4/Makefile" else srtp_make="" fi --- kphoneSI_1.0/configure.in.orig 2006-06-17 20:09:49.000000000 +0200 +++ kphoneSI_1.0/configure.in 2006-06-17 20:10:15.000000000 +0200 @@ -206,7 +206,7 @@ AC_LANG_CPLUSPLUS if test "$enable_srtp" = "yes"; then - srtp_make="srtp/Makefile" + srtp_make="srtp-1.4/Makefile" else srtp_make="" fi --- kphoneSI_1.0/kphone/Makefile.in.orig 2006-06-17 20:16:10.000000000 +0200 +++ kphoneSI_1.0/kphone/Makefile.in 2006-06-17 20:16:19.000000000 +0200 @@ -19,7 +19,7 @@ endif ifeq (@ENABLE_SRTP@,yes) -SR=srtp +SR=srtp-1.4 LIBS+=-lsrtp endif --- kphoneSI_1.0/Makefile.in.orig 2006-06-17 20:15:13.000000000 +0200 +++ kphoneSI_1.0/Makefile.in 2006-06-17 20:15:24.000000000 +0200 @@ -1,5 +1,5 @@ ifeq (@ENABLE_SRTP@,yes) -SR=srtp +SR=srtp-1.4 endif SUBDIRS=po dissipate2 gsm ilbc Speex $(SR) ringing kphone --- kphoneSI_1.0/kphone/dspoutrtp.h.orig 2006-06-17 20:36:46.000000000 +0200 +++ kphoneSI_1.0/kphone/dspoutrtp.h 2006-06-17 20:36:51.000000000 +0200 @@ -14,7 +14,7 @@ #include "../Speex/speex.h" #include "../Speex/speex_define.h" #ifdef SRTPWRAPPER_HX -#include "../srtp/SRTPWrapper.h" +#include "../srtp-1.4/SRTPWrapper.h" #endif #define GSM_ENC_BYTES 33 #define GSM_DEC_SAMPLES 160 --- kphoneSI_1.0/srtp-1.4/Makefile.in.orig 2006-06-17 20:42:29.000000000 +0200 +++ kphoneSI_1.0/srtp-1.4/Makefile.in 2006-06-17 20:42:47.000000000 +0200 @@ -10,7 +10,7 @@ OBJS = SRTPWrapper.o -all: srtp.a +all: srtp-1.4.a %.o: %.S @@ -28,5 +28,5 @@ dep: makedepend -- $(CXXFLAGS) *.cpp -srtp.a: $(OBJS) +srtp-1.4.a: $(OBJS) $(AR) rcs $@ $(OBJS)