1 diff -ur orig/twinkle-0.6.1/configure.in twinkle-0.6.1/configure.in
2 --- orig/twinkle-0.6.1/configure.in 2006-02-11 14:40:40.000000000 +0000
3 +++ twinkle-0.6.1/configure.in 2006-02-21 10:49:26.000000000 +0000
5 echo "LIBS += -lasound" >> $QT_INCL_PRO
8 +# Check if libgsm is available
9 +AC_CHECK_LIB(gsm, sf_open, [],
10 + [AC_MSG_ERROR([libgsm library is missing.])])
11 +AC_CHECK_HEADER(gsm.h, [],
12 + [AC_MSG_ERROR([gsm header files msiing (gsm.h)])])
14 $QTDIR/bin/qmake -o src/gui/Makefile src/gui/twinkle.pro
15 echo "distdir:" >> src/gui/Makefile
17 diff -ur orig/twinkle-0.6.1/src/audio/audio_rx.h twinkle-0.6.1/src/audio/audio_rx.h
18 --- orig/twinkle-0.6.1/src/audio/audio_rx.h 2006-01-01 15:38:04.000000000 +0000
19 +++ twinkle-0.6.1/src/audio/audio_rx.h 2006-02-21 10:34:57.000000000 +0000
22 #include "threads/mutex.h"
23 #include "threads/sema.h"
24 -#include "gsm/inc/gsm.h"
26 #include "audio_device.h"
27 #include "twinkle_rtp_session.h"
29 diff -ur orig/twinkle-0.6.1/src/audio/audio_tx.h twinkle-0.6.1/src/audio/audio_tx.h
30 --- orig/twinkle-0.6.1/src/audio/audio_tx.h 2006-01-01 15:38:04.000000000 +0000
31 +++ twinkle-0.6.1/src/audio/audio_tx.h 2006-02-21 10:35:16.000000000 +0000
33 #include "media_buffer.h"
34 #include "rtp_telephone_event.h"
35 #include "threads/mutex.h"
36 -#include "gsm/inc/gsm.h"
38 #include "audio_device.h"
39 #include "twinkle_rtp_session.h"
41 diff -ur orig/twinkle-0.6.1/src/audio/Makefile.am twinkle-0.6.1/src/audio/Makefile.am
42 --- orig/twinkle-0.6.1/src/audio/Makefile.am 2005-10-09 20:11:36.000000000 +0100
43 +++ twinkle-0.6.1/src/audio/Makefile.am 2006-02-21 10:35:37.000000000 +0000
50 EXTRA_DIST = README_G711
51 diff -ur orig/twinkle-0.6.1/src/gui/twinkle.pro twinkle-0.6.1/src/gui/twinkle.pro
52 --- orig/twinkle-0.6.1/src/gui/twinkle.pro 2006-02-11 08:34:27.000000000 +0000
53 +++ twinkle-0.6.1/src/gui/twinkle.pro 2006-02-21 11:05:20.000000000 +0000
56 CONFIG += qt warn_off release thread
58 -LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile
59 +LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lgsm
63 Only in twinkle-0.6.1/src/gui: .ui
64 diff -ur orig/twinkle-0.6.1/src/Makefile.am twinkle-0.6.1/src/Makefile.am
65 --- orig/twinkle-0.6.1/src/Makefile.am 2006-02-03 22:28:58.000000000 +0000
66 +++ twinkle-0.6.1/src/Makefile.am 2006-02-21 10:40:53.000000000 +0000
68 $(top_builddir)/src/sockets/libsocket.a\
69 $(top_builddir)/src/threads/libthread.a\
70 $(top_builddir)/src/audio/libaudio.a\
71 - $(top_builddir)/src/audio/gsm/libgsm.a\
72 $(top_builddir)/src/audits/libaudits.a\
73 $(top_builddir)/src/stun/libstun.a\
79 libtwinkle_a_SOURCES =\