diff -Nur kphoneSI.orig/configure kphoneSI/configure --- kphoneSI.orig/configure 2006-10-02 16:20:03.000000000 +0200 +++ kphoneSI/configure 2006-10-02 16:20:16.000000000 +0200 @@ -5079,7 +5079,7 @@ fi if test "$enable_srtp" = "yes"; then - srtp_make="srtp/Makefile" + srtp_make="srtp-1.4/Makefile" else srtp_make="" fi diff -Nur kphoneSI.orig/configure.in kphoneSI/configure.in --- kphoneSI.orig/configure.in 2006-10-02 16:20:03.000000000 +0200 +++ kphoneSI/configure.in 2006-10-02 16:20:16.000000000 +0200 @@ -208,7 +208,7 @@ fi if test "$enable_srtp" = "yes"; then - srtp_make="srtp/Makefile" + srtp_make="srtp-1.4/Makefile" else srtp_make="" fi diff -Nur kphoneSI.orig/kphone/dspoutrtp.h kphoneSI/kphone/dspoutrtp.h --- kphoneSI.orig/kphone/dspoutrtp.h 2006-10-02 16:20:03.000000000 +0200 +++ kphoneSI/kphone/dspoutrtp.h 2006-10-02 16:20:16.000000000 +0200 @@ -16,7 +16,7 @@ #include "../Speex/speex_define.h" #endif #ifdef SRTPWRAPPER_HX -#include "../srtp/SRTPWrapper.h" +#include "../srtp-1.4/SRTPWrapper.h" #endif #define GSM_ENC_BYTES 33 #define GSM_DEC_SAMPLES 160 diff -Nur kphoneSI.orig/kphone/Makefile.in kphoneSI/kphone/Makefile.in --- kphoneSI.orig/kphone/Makefile.in 2006-10-02 16:20:03.000000000 +0200 +++ kphoneSI/kphone/Makefile.in 2006-10-02 16:20:33.000000000 +0200 @@ -13,7 +13,7 @@ CXXFLAGS=$(CFLAGS) ifeq (@ENABLE_SRTP@,yes) -SR=srtp +SR=srtp-1.4 LR=-lsrtp endif diff -Nur kphoneSI.orig/Makefile.in kphoneSI/Makefile.in --- kphoneSI.orig/Makefile.in 2006-10-02 16:20:03.000000000 +0200 +++ kphoneSI/Makefile.in 2006-10-02 16:20:16.000000000 +0200 @@ -1,5 +1,5 @@ ifeq (@ENABLE_SRTP@,yes) -SR=srtp +SR=srtp-1.4 endif ifeq (@ENABLE_SPEEX@,yes) diff -Nur kphoneSI.orig/srtp-1.4/Makefile.in kphoneSI/srtp-1.4/Makefile.in --- kphoneSI.orig/srtp-1.4/Makefile.in 2006-10-02 16:20:03.000000000 +0200 +++ kphoneSI/srtp-1.4/Makefile.in 2006-10-02 16:20:16.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)