[asterisk-commits] mmichelson: branch 1.6.0 r114576 - in /branches/1.6.0: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Apr 22 19:41:12 2008
New Revision: 114576

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114576
Log:
Merged revisions 114575 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r114575 | mmichelson | 2008-04-22 19:40:30 -0500 (Tue, 22 Apr 2008) | 10 lines

Round 1 of IMAP_STORAGE-related app_voicemail changes

This makes IMAP_STORAGE include the proper headers if you
have specified the "system" option for --with-imap when running
the configure script and your IMAP-related headers exist in 
/usr/include/c-client.

This change is due to a hasty merge of a 1.4 change I made.


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_voicemail.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_voicemail.c?view=diff&rev=114576&r1=114575&r2=114576
==============================================================================
--- branches/1.6.0/apps/app_voicemail.c (original)
+++ branches/1.6.0/apps/app_voicemail.c Tue Apr 22 19:41:12 2008
@@ -75,6 +75,10 @@
 #include <imap/c-client.h>
 #include <imap/imap4r1.h>
 #include <imap/linkage.h>
+#elif defined (USE_SYSTEM_CCLIENT)
+#include <c-client/c-client.h>
+#include <c-client/imap4r1.h>
+#include <c-client/linkage.h>
 #else
 #include "c-client.h"
 #include "imap4r1.h"
@@ -5038,6 +5042,8 @@
 		char *cp;
 #ifdef USE_SYSTEM_IMAP
 #include <imap/linkage.c>
+#elif defined(USE_SYSTEM_CCLIENT)
+#include <c-client/linkage.c>
 #else
 #include "linkage.c"
 #endif