[asterisk-commits] twilson: trunk r266386 - in /trunk: ./ res/

[SVN commits to the Asterisk project]

Author: twilson
Date: Fri May 28 17:54:03 2010
New Revision: 266386

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=266386
Log:
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.

Modified:
    trunk/configure
    trunk/configure.ac
    trunk/res/res_calendar_caldav.c
    trunk/res/res_calendar_icalendar.c

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=266386&r1=266385&r2=266386
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri May 28 17:54:03 2010
@@ -924,9 +924,6 @@
 
 # Some distributions (like RedHat) add a libical subdirectory for the headers
 AST_EXT_LIB_CHECK([ICAL], [ical], [icaltimezone_get_utc_timezone], [libical/ical.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}])
-if test x"${PBX_ICAL}" = x1; then
-	ICAL_INCLUDE+=" -I/usr/include/libical"
-fi
 
 AST_EXT_LIB_CHECK([ICAL], [ical], [icaltimezone_new], [ical.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}])
 

Modified: trunk/res/res_calendar_caldav.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_calendar_caldav.c?view=diff&rev=266386&r1=266385&r2=266386
==============================================================================
--- trunk/res/res_calendar_caldav.c (original)
+++ trunk/res/res_calendar_caldav.c Fri May 28 17:54:03 2010
@@ -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>

Modified: trunk/res/res_calendar_icalendar.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_calendar_icalendar.c?view=diff&rev=266386&r1=266385&r2=266386
==============================================================================
--- trunk/res/res_calendar_icalendar.c (original)
+++ trunk/res/res_calendar_icalendar.c Fri May 28 17:54:03 2010
@@ -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>