[svn-commits] mmichelson: branch mmichelson/imap-configure r103681 - /team/mmichelson/imap-...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Feb 14 13:45:57 2008
New Revision: 103681

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103681
Log:
Now the necessary changes have been made to app_voicemail. I have tested this using
both static and dynamic linking, and it seems to work correctly. Yay! It's nearly merge time


Modified:
    team/mmichelson/imap-configure/apps/app_voicemail.c

Modified: team/mmichelson/imap-configure/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/imap-configure/apps/app_voicemail.c?view=diff&rev=103681&r1=103680&r2=103681
==============================================================================
--- team/mmichelson/imap-configure/apps/app_voicemail.c (original)
+++ team/mmichelson/imap-configure/apps/app_voicemail.c Thu Feb 14 13:45:57 2008
@@ -70,9 +70,19 @@
 #include <ctype.h>
 #include <signal.h>
 #include <pwd.h>
+#ifdef USE_SYSTEM_IMAP
+#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"
 #include "linkage.h"
+#endif
 #endif
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
@@ -4759,7 +4769,13 @@
 
 	if (delimiter == '\0') {		/* did not probe the server yet */
 		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
 		/* Connect to INBOX first to get folders delimiter */
 		imap_mailbox_name(tmp, sizeof(tmp), vms, 0, 1);
 		stream = mail_open (stream, tmp, debug ? OP_DEBUG : NIL);