[svn-commits] trunk r29553 - in /trunk: ./ build_tools/ channels/
configs/ doc/ include/ in...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Mon May 22 14:12:30 MST 2006
Author: mogorman
Date: Mon May 22 16:12:30 2006
New Revision: 29553
URL: http://svn.digium.com/view/asterisk?rev=29553&view=rev
Log:
asterisk-xmpp merge in
Added:
trunk/channels/chan_jingle.c
- copied unchanged from r29552, team/group/asterisk-xmpp/channels/chan_jingle.c
trunk/configs/jabber.conf.sample
- copied unchanged from r29552, team/group/asterisk-xmpp/configs/jabber.conf.sample
trunk/configs/jingle.conf.sample
- copied unchanged from r29552, team/group/asterisk-xmpp/configs/jingle.conf.sample
trunk/doc/jabber.txt
- copied unchanged from r29552, team/group/asterisk-xmpp/doc/jabber.txt
trunk/doc/jingle.txt
- copied unchanged from r29552, team/group/asterisk-xmpp/doc/jingle.txt
trunk/include/asterisk/jabber.h
- copied unchanged from r29552, team/group/asterisk-xmpp/include/asterisk/jabber.h
trunk/include/asterisk/jingle.h
- copied unchanged from r29552, team/group/asterisk-xmpp/include/asterisk/jingle.h
trunk/res/res_jabber.c
- copied unchanged from r29552, team/group/asterisk-xmpp/res/res_jabber.c
Modified:
trunk/ (props changed)
trunk/build_tools/menuselect-deps.in
trunk/channels/Makefile
trunk/configs/extensions.conf.sample
trunk/configure.ac
trunk/include/autoconfig.h.in
trunk/makeopts.in
trunk/res/Makefile
Propchange: trunk/
------------------------------------------------------------------------------
--- automerge-email (added)
+++ automerge-email Mon May 22 16:12:30 2006
@@ -1,0 +1,1 @@
+mogorman at digium.com
Propchange: trunk/
------------------------------------------------------------------------------
svnmerge-integrated = /trunk:1-29516
Modified: trunk/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/menuselect-deps.in?rev=29553&r1=29552&r2=29553&view=diff
==============================================================================
--- trunk/build_tools/menuselect-deps.in (original)
+++ trunk/build_tools/menuselect-deps.in Mon May 22 16:12:30 2006
@@ -24,4 +24,5 @@
ZLIB=@PBX_LIBZLIB@
ZAPTEL=@PBX_LIBZAPTEL@
LIBGSM=@PBX_LIBgsm@
+IKSEMEL=@PBX_LIBIKSEMEL@
IXJUSER=@PBX_IXJUSER@
Modified: trunk/channels/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/channels/Makefile?rev=29553&r1=29552&r2=29553&view=diff
==============================================================================
--- trunk/channels/Makefile (original)
+++ trunk/channels/Makefile Mon May 22 16:12:30 2006
@@ -131,6 +131,12 @@
chan_vpb.so: chan_vpb.o
$(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl
+chan_jingle.o: chan_jingle.c
+ $(CC) -c -o $@ $(CFLAGS) $(IKSEMEL_INCLUDE) $<
+
+chan_jingle.so: chan_jingle.o
+ $(CC) $(SOLINK) -o $@ $< $(IKSEMEL_LIB)
+
ifeq ($(OSARCH),Linux)
chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast
$(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++
Modified: trunk/configs/extensions.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/extensions.conf.sample?rev=29553&r1=29552&r2=29553&view=diff
==============================================================================
--- trunk/configs/extensions.conf.sample (original)
+++ trunk/configs/extensions.conf.sample Mon May 22 16:12:30 2006
@@ -505,6 +505,8 @@
;exten => 6245,dial+101,Voicemail(6245,b) ; Voicemail (busy)
;exten => 6361,1,Dial(IAX2/JaneDoe,,rm) ; ring without time limit
;exten => 6389,1,Dial(MGCP/aaln/1 at 192.168.0.14)
+;exten => 6390,1,Dial(JINGLE/caller/callee) ; Dial via jingle using labels
+;exten => 6391,1,Dial(JINGLE/asterisk at digium.com/mogorman at astjab.org) ;Dial via jingle using asterisk as the transport and calling mogorman.
;exten => 6394,1,Dial(Local/6275/n) ; this will dial ${MARK}
;exten => 6275,1,Macro(stdexten,6275,${MARK}) ; assuming ${MARK} is something like Zap/2
Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?rev=29553&r1=29552&r2=29553&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon May 22 16:12:30 2006
@@ -190,6 +190,7 @@
AST_EXT_LIB([asound], [snd_spcm_init], [alsa/asoundlib.h], [ALSA], [Advanced Linux Sound Architecture], [-lm -ldl])
AST_EXT_LIB([curses], [initscr], [curses.h], [CURSES], [curses], [])
+AST_EXT_LIB([iksemel], [iks_start_sasl], [iksemel.h], [IKSEMEL], [Iksemel Jabber Library])
AST_EXT_LIB([nbs], [nbs_connect], [nbs.h], [NBS], [Network Broadcast Sound])
AST_EXT_LIB([ncurses], [initscr], [curses.h], [NCURSES], [ncurses], [])
AST_EXT_LIB([newt], [newtBell], [newt.h], [NEWT], [newt])
Modified: trunk/include/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/trunk/include/autoconfig.h.in?rev=29553&r1=29552&r2=29553&view=diff
==============================================================================
--- trunk/include/autoconfig.h.in (original)
+++ trunk/include/autoconfig.h.in Mon May 22 16:12:30 2006
@@ -111,6 +111,9 @@
/* Define if your system has the GTK libraries. */
#undef HAVE_GTK
+
+/* Define to indicate the Iksemel Jabber Library library */
+#undef HAVE_IKSEMEL
/* Define to 1 if you have the `inet_ntoa' function. */
#undef HAVE_INET_NTOA
Modified: trunk/makeopts.in
URL: http://svn.digium.com/view/asterisk/trunk/makeopts.in?rev=29553&r1=29552&r2=29553&view=diff
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Mon May 22 16:12:30 2006
@@ -88,6 +88,9 @@
PWLIB_LIB=@PWLIB_LIB@
PWLIB_INCLUDE=@PWLIB_INCLUDE@
+IKSEMEL_LIB=@IKSEMEL_LIB@
+IKSEMEL_INCLUDE=@IKSEMEL_INCLUDE@
+
SSL_LIB=@OPENSSL_LIB@
SSL_INCLUDE=@OPENSSL_INCLUDE@
Modified: trunk/res/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/res/Makefile?rev=29553&r1=29552&r2=29553&view=diff
==============================================================================
--- trunk/res/Makefile (original)
+++ trunk/res/Makefile Mon May 22 16:12:30 2006
@@ -73,6 +73,12 @@
res_odbc.o: res_odbc.c
$(CC) -c -o $@ $(CFLAGS) $(ODBC_INCLUDE) $<
+res_jabber.o: res_jabber.c
+ $(CC) -c -o $@ $(CFLAGS) $(IKSEMEL_INCLUDE) $<
+
+res_jabber.so: res_jabber.o
+ $(CC) $(SOLINK) -o $@ $< $(IKSEMEL_LIB)
+
res_osp.so: res_osp.o
$(CC) $(SOLINK) -o $@ $< $(OSPTK_LIB)
More information about the svn-commits
mailing list