Merged revisions 66157 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Fri, 25 May 2007 14:37:55 +0000 (14:37 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Fri, 25 May 2007 14:37:55 +0000 (14:37 +0000)
commitc74518e3ff958e4087ee7de34418ae0b57f6aeac
treec8a19d6fa9f9ea03bc06e0322f5931cc741c1a73
parentf65934a517d9d5109d3c049fd48a34b6d40fdf2a
Merged revisions 66157 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r66157 | kpfleming | 2007-05-25 10:28:46 -0400 (Fri, 25 May 2007) | 3 lines

handle the GNUTLS library properly in the configure script and build system
don't build in OSP support unless we have found and are allowed to use SSL support

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_gtalk.c
channels/chan_jingle.c
configure
configure.ac
makeopts.in
res/res_jabber.c