[svn-commits] kpfleming: branch 1.4 r65966 - /branches/1.4/channels/chan_gtalk.c

svn-commits at lists.digium.com svn-commits at lists.digium.com
Thu May 24 11:25:22 MST 2007


Author: kpfleming
Date: Thu May 24 13:25:21 2007
New Revision: 65966

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65966
Log:
don't reference GnuTLS headers and functions unless the configure script found it

Modified:
    branches/1.4/channels/chan_gtalk.c

Modified: branches/1.4/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_gtalk.c?view=diff&rev=65966&r1=65965&r2=65966
==============================================================================
--- branches/1.4/channels/chan_gtalk.c (original)
+++ branches/1.4/channels/chan_gtalk.c Thu May 24 13:25:21 2007
@@ -47,10 +47,12 @@
 #include <arpa/inet.h>
 #include <sys/signal.h>
 #include <iksemel.h>
-
+#include <pthread.h>
+
+#if HAVE_GNUTLS
 #include <gcrypt.h>
-#include <pthread.h>
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif /* HAVE_GNUTLS */
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
@@ -1809,7 +1811,9 @@
 /*! \brief Load module into PBX, register channel */
 static int load_module(void)
 {
+#if HAVE_GNUTLS	
         gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+#endif /* HAVE_GNUTLS */
 
 	ASTOBJ_CONTAINER_INIT(&gtalk_list);
 	if (!gtalk_load_config()) {



More information about the svn-commits mailing list