mirror of
https://abf.rosa.ru/djam/asterisk.git
synced 2025-02-23 10:32:57 +00:00
100 lines
3.4 KiB
Diff
100 lines
3.4 KiB
Diff
diff -ur asterisk-1.8.1.1.orig//configure.ac asterisk-1.8.1.1/configure.ac
|
|
--- asterisk-1.8.1.1.orig//configure.ac.neon 2010-12-17 12:04:52.000000000 +0100
|
|
+++ asterisk-1.8.1.1./configure.ac 2010-12-17 12:05:05.000000000 +0100
|
|
@@ -1687,7 +1687,7 @@
|
|
AST_EXT_TOOL_CHECK([NEON], [neon-config])
|
|
|
|
AST_EXT_TOOL_CHECK([NEON29], [neon-config], , [--libs],
|
|
-[#include <ne_auth.h>],
|
|
+[#include <neon/ne_auth.h>],
|
|
[#ifndef NE_AUTH_NTLM
|
|
#error Need libneon >= 0.29.0
|
|
#endif])
|
|
diff -ur asterisk-1.8.1.1.orig//res/res_calendar_caldav.c asterisk-1.8.1.1/res/res_calendar_caldav.c
|
|
--- asterisk-1.8.1.1.orig//res/res_calendar_caldav.c 2010-09-17 10:37:49.000000000 +0200
|
|
+++ asterisk-1.8.1.1/res/res_calendar_caldav.c 2010-12-17 12:12:39.000000000 +0100
|
|
@@ -30,11 +30,11 @@
|
|
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 287269 $")
|
|
|
|
#include <libical/ical.h>
|
|
-#include <ne_session.h>
|
|
-#include <ne_uri.h>
|
|
-#include <ne_request.h>
|
|
-#include <ne_auth.h>
|
|
-#include <ne_redirect.h>
|
|
+#include <neon/ne_session.h>
|
|
+#include <neon/ne_uri.h>
|
|
+#include <neon/ne_request.h>
|
|
+#include <neon/ne_auth.h>
|
|
+#include <neon/ne_redirect.h>
|
|
#include <libxml/xmlmemory.h>
|
|
#include <libxml/parser.h>
|
|
|
|
diff -ur asterisk-1.8.1.1.orig//res/res_calendar_ews.c asterisk-1.8.1.1/res/res_calendar_ews.c
|
|
--- asterisk-1.8.1.1.orig//res/res_calendar_ews.c 2010-09-17 10:44:28.000000000 +0200
|
|
+++ asterisk-1.8.1.1/res/res_calendar_ews.c 2010-12-17 12:12:24.000000000 +0100
|
|
@@ -27,15 +27,15 @@
|
|
|
|
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 287271 $")
|
|
|
|
-#include <ne_request.h>
|
|
-#include <ne_session.h>
|
|
-#include <ne_uri.h>
|
|
-#include <ne_socket.h>
|
|
-#include <ne_auth.h>
|
|
-#include <ne_xml.h>
|
|
-#include <ne_xmlreq.h>
|
|
-#include <ne_utils.h>
|
|
-#include <ne_redirect.h>
|
|
+#include <neon/ne_request.h>
|
|
+#include <neon/ne_session.h>
|
|
+#include <neon/ne_uri.h>
|
|
+#include <neon/ne_socket.h>
|
|
+#include <neon/ne_auth.h>
|
|
+#include <neon/ne_xml.h>
|
|
+#include <neon/ne_xmlreq.h>
|
|
+#include <neon/ne_utils.h>
|
|
+#include <neon/ne_redirect.h>
|
|
|
|
#include "asterisk/module.h"
|
|
#include "asterisk/calendar.h"
|
|
diff -ur asterisk-1.8.1.1.orig//res/res_calendar_exchange.c asterisk-1.8.1.1/res/res_calendar_exchange.c
|
|
--- asterisk-1.8.1.1.orig//res/res_calendar_exchange.c 2010-12-17 11:53:43.000000000 +0100
|
|
+++ asterisk-1.8.1.1/res/res_calendar_exchange.c 2010-12-17 12:12:52.000000000 +0100
|
|
@@ -30,11 +30,11 @@
|
|
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 300214 $")
|
|
|
|
#include <libical/ical.h>
|
|
-#include <ne_session.h>
|
|
-#include <ne_uri.h>
|
|
-#include <ne_request.h>
|
|
-#include <ne_auth.h>
|
|
-#include <ne_redirect.h>
|
|
+#include <neon/ne_session.h>
|
|
+#include <neon/ne_uri.h>
|
|
+#include <neon/ne_request.h>
|
|
+#include <neon/ne_auth.h>
|
|
+#include <neon/ne_redirect.h>
|
|
#include <iksemel.h>
|
|
|
|
#include "asterisk/module.h"
|
|
diff -ur asterisk-1.8.1.1.orig//res/res_calendar_icalendar.c asterisk-1.8.1.1/res/res_calendar_icalendar.c
|
|
--- asterisk-1.8.1.1.orig//res/res_calendar_icalendar.c 2010-09-17 10:37:49.000000000 +0200
|
|
+++ asterisk-1.8.1.1/res/res_calendar_icalendar.c 2010-12-17 12:12:56.000000000 +0100
|
|
@@ -29,11 +29,11 @@
|
|
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 300214 $")
|
|
|
|
#include <libical/ical.h>
|
|
-#include <ne_session.h>
|
|
-#include <ne_uri.h>
|
|
-#include <ne_request.h>
|
|
-#include <ne_auth.h>
|
|
-#include <ne_redirect.h>
|
|
+#include <neon/ne_session.h>
|
|
+#include <neon/ne_uri.h>
|
|
+#include <neon/ne_request.h>
|
|
+#include <neon/ne_auth.h>
|
|
+#include <neon/ne_redirect.h>
|
|
|
|
#include "asterisk/module.h"
|
|
#include "asterisk/calendar.h"
|