From 9a2f04ce26cb6a6a10245af34a781b6150ba30a8 Mon Sep 17 00:00:00 2001
From: Terry Wilson <twilson@digium.com>
Date: Fri, 28 May 2010 22:54:03 +0000
Subject: Fix ical library handling (again)

Newer versions of libical (which we require) store the header file in a
libical/ subfolder and include an ical.h file that does a #warning for
deprecation and then #includes <libical/ical.h>. Since we now test for
libical/ical.h, we can change the #includes back to <libical/ical.h> and
remove the test which specifically adds /usr/include/libical as an include
directory.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@266386 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 res/res_calendar_caldav.c    | 2 +-
 res/res_calendar_icalendar.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/res_calendar_caldav.c b/res/res_calendar_caldav.c
index 63b6a6ba6..583b4b1de 100644
--- a/res/res_calendar_caldav.c
+++ b/res/res_calendar_caldav.c
@@ -29,7 +29,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <ical.h>
+#include <libical/ical.h>
 #include <ne_session.h>
 #include <ne_uri.h>
 #include <ne_request.h>
diff --git a/res/res_calendar_icalendar.c b/res/res_calendar_icalendar.c
index 8c0966528..34a8b101b 100644
--- a/res/res_calendar_icalendar.c
+++ b/res/res_calendar_icalendar.c
@@ -28,7 +28,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <ical.h>
+#include <libical/ical.h>
 #include <ne_session.h>
 #include <ne_uri.h>
 #include <ne_request.h>
-- 
cgit v1.2.3